diff --git a/Directory.Build.props b/Directory.Build.props
index 15a18d5b96..1ee16833a4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -76,19 +76,16 @@
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
       <PropertyGroup>
         <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">iossimulator-x64</RuntimeIdentifier>
       </PropertyGroup>
     </When>
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
       <PropertyGroup>
         <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">osx-x64</RuntimeIdentifier>
       </PropertyGroup>
     </When>
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
       <PropertyGroup>
         <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">maccatalyst-x64</RuntimeIdentifier>
       </PropertyGroup>
     </When>
     <When Condition="$(TargetFramework.Contains('windows10'))">
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 073a0a8c10..4d940b98e7 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -2,19 +2,22 @@
   <Import Project="..\Directory.Build.targets" />
 
   <Target Name="CopyNuGetReadme"
-          BeforeTargets="_GetPackageFiles"
+          BeforeTargets="Build;CoreCompile"
           Condition=" $(IsPackable) == 'true' ">
-    <Exec Command="echo # $(PackageId) > $(IntermediateOutputPath)\readme.txt"
+    <Exec Command="echo # $(PackageId) > $(IntermediateOutputPath)\ReadMe.md"
           ConsoleToMsBuild="true" />
 
-    <Exec Command="type $(MSBuildThisFileDirectory)ReadMe.md >> $(IntermediateOutputPath)\readme.txt"
+    <Exec Command="type $(MSBuildThisFileDirectory)ReadMe.md >> $(IntermediateOutputPath)\ReadMe.md"
           ConsoleToMsBuild="true" />
   </Target>
 
   <Target Name="PackNuGetReadMe"
           AfterTargets="CopyNuGetReadme">
+    <PropertyGroup>
+      <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
+    </PropertyGroup>
     <ItemGroup>
-      <_PackageFiles Include="$(IntermediateOutputPath)\readme.txt" PackagePath="" />
+      <None Include="$(IntermediateOutputPath)\ReadMe.md" PackagePath="\" Pack="true" />
     </ItemGroup>
   </Target>