Merge pull request #36164 from mmitche/use-non-arch-properties

Use non-arch specific properties for shared framework versions

Author: mmitche

eng/Version.Details.xml

@@ -42,11 +42,7 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
     </Dependency>
-    <!--
-         Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
-         All Runtime.$rid packages should have the same version.
-    -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25278.103">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25278.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
     </Dependency>

eng/Versions.props

@@ -26,7 +26,7 @@
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25278.103</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
     <MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25278.103</MicrosoftExtensionsLoggingVersion>
     <MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25278.103</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25278.103</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25278.103</MicrosoftNETCorePlatformsVersion>
     <SystemTextEncodingsWebVersion>10.0.0-preview.6.25278.103</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>10.0.0-preview.6.25278.103</SystemTextJsonVersion>
     <SystemFormatsAsn1Version>10.0.0-preview.6.25278.103</SystemFormatsAsn1Version>

eng/helix.proj

@@ -30,7 +30,7 @@
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
     </AdditionalDotNetPackageFeed>
 
-    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRuntimewinx64Version)">
+    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRefVersion)">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
   </ItemGroup>

global.json

@@ -13,7 +13,7 @@
     "dotnet": "10.0.100-preview.6.25272.112",
     "runtimes": {
       "dotnet": [
-        "$(MicrosoftNETCoreAppRuntimewinx64Version)"
+        "$(MicrosoftNETCorePlatformsVersion)"
       ]
     }
   },

test/Directory.Build.props

@@ -10,7 +10,7 @@
   <ItemGroup>
     <FrameworkReference Update="Microsoft.NETCore.App"
                         Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"
-                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
                         TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
   </ItemGroup>