Skip to content

Commit 10c8369

Browse files
authored
Replace arch-specific package properties with arch neutral ones (#13444)
This avoids need for a workaround in VMR builds and reduces friction for stable builds. When building non-win-x64 verticals, we end up having to set the x64 runtime pack and x64 VS redist pack properties (stable and non-stable properties) based on other values in the VMR orchestrator. Instead, use MicrosoftNEtCoreAppRef as the stable version property, and MicrosoftNETCOrePlatforms as the non-stable one.
1 parent 5821493 commit 10c8369

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
</ItemGroup>
8181

8282
<PropertyGroup>
83-
<!-- Set RuntimeFrameworkVersion to MicrosoftNETCoreAppRuntimewinx64PackageVersion from Core Setup to prevent large SDK cycle -->
84-
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</RuntimeFrameworkVersion>
83+
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRefPackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
8584

8685
<!-- If TargetFramework is not net8.x, then reset RuntimeFrameworkVersion -->
8786
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" />

eng/Version.Details.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
88
<Dependencies>
99
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="85778473549347b3e4bad3ea009e9438df7b11bb" BarId="267776" />
1010
<ProductDependencies>
11-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25260.104">
12-
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
14-
</Dependency>
1511
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25260.104">
1612
<Uri>https://github.com/dotnet/dotnet</Uri>
1713
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
@@ -60,10 +56,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
6056
<Uri>https://github.com/dotnet/dotnet</Uri>
6157
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
6258
</Dependency>
63-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25260.104">
64-
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
66-
</Dependency>
6759
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25260.104">
6860
<Uri>https://github.com/dotnet/dotnet</Uri>
6961
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>

eng/Versions.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25260.104</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
1918
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25260.104</SystemFormatsNrbfPackageVersion>
2019
<SystemIOHashingPackageVersion>10.0.0-preview.5.25260.104</SystemIOHashingPackageVersion>
2120
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
@@ -24,7 +23,6 @@
2423
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25260.104</SystemRuntimeSerializationFormattersPackageVersion>
2524
<SystemTextJsonPackageVersion>10.0.0-preview.5.25260.104</SystemTextJsonPackageVersion>
2625
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCoreAppRefPackageVersion>
27-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
2826
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCorePlatformsPackageVersion>
2927
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftWin32SystemEventsPackageVersion>
3028
<SystemCodeDomPackageVersion>10.0.0-preview.5.25260.104</SystemCodeDomPackageVersion>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"dotnet": "10.0.100-preview.3.25201.16",
44
"runtimes": {
55
"dotnet/x64": [
6-
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
6+
"$(MicrosoftNETCorePlatformsPackageVersion)"
77
],
88
"dotnet/x86": [
9-
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
9+
"$(MicrosoftNETCorePlatformsPackageVersion)"
1010
]
1111
}
1212
},

0 commit comments

Comments
 (0)