From e3625095d3c71a5cced143deec45c33047301b57 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Fri, 16 May 2025 09:05:13 -0700
Subject: [PATCH] Do not use arch-specific properties for stable/nonstable
 versions

---
 eng/InstallRuntimes.proj |  4 ++--
 eng/Version.Details.xml  |  6 +-----
 eng/Versions.props       | 12 ++++++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj
index b5ddc047d9..9dbfd87967 100644
--- a/eng/InstallRuntimes.proj
+++ b/eng/InstallRuntimes.proj
@@ -35,7 +35,7 @@
 
   <PropertyGroup>
     <CommonInstallArgs>-NoPath -SkipNonVersionedFiles -Architecture $(BuildArch) -InstallDir $(DotNetInstallRoot)</CommonInstallArgs>
-    <DotNetInstallDir>$([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRuntimewinx64Version)'))</DotNetInstallDir>
+    <DotNetInstallDir>$([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRefVersion)'))</DotNetInstallDir>
     <TestConfigFileName>$(DotNetInstallRoot)Debugger.Tests.Versions.txt</TestConfigFileName>
   </PropertyGroup>
 
@@ -103,7 +103,7 @@
           Condition="'$(LiveRuntimeDir)' != ''"
           Inputs="$(VersionsPropsPath)"
           Outputs="$(TestConfigFileName)">
-    
+
     <ItemGroup>
       <_LiveRuntimeFiles Include="$(LiveRuntimeDir)\**\*.*" />
     </ItemGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a5ecb2bfc1..7a24e9a6c2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -35,11 +35,7 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25229.109">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
-    </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25229.109">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25229.109">
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2d6fa85710..2768cb2959 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,8 +16,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25229.109</VSRedistCommonNetCoreSharedFrameworkx64100Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25229.109</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25229.109</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25229.109</MicrosoftNETCoreAppRefVersion>
     <!-- Latest shared aspnetcore version updated by darc -->
     <MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.5.25229.109</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.5.25229.109</MicrosoftAspNetCoreAppRefVersion>
@@ -114,8 +114,8 @@
   </PropertyGroup>
   <ItemGroup Condition="!$(PrivateBuildTesting) AND !$(InternalReleaseTesting)">
     <RuntimeTestVersions Include="Latest">
-      <RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx64100Version)</RuntimeDownload>
-      <Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
+      <RuntimeDownload>$(MicrosoftNETCorePlatformsVersion)</RuntimeDownload>
+      <Runtime>$(MicrosoftNETCoreAppRefVersion)</Runtime>
       <AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
       <AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
       <TargetFramework>net10.0</TargetFramework>
@@ -138,8 +138,8 @@
   <!-- Private build testing -->
   <ItemGroup Condition="$(PrivateBuildTesting)">
     <RuntimeTestVersions Include="Latest">
-      <RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx64100Version)</RuntimeDownload>
-      <Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
+      <RuntimeDownload>$(MicrosoftNETCorePlatformsVersion)</RuntimeDownload>
+      <Runtime>$(MicrosoftNETCoreAppRefVersion)</Runtime>
       <AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
       <AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
       <TargetFramework>net10.0</TargetFramework>