Mirror
/
dotnet-winforms
mirror of https://github.com/dotnet/winforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
pull/13449/head
Matt Mitchell 3 months ago
committed by GitHub
parent
5821493f0b
commit
10c8369f4f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Directory.Build.targets
  2. 8
      eng/Version.Details.xml
  3. 2
      eng/Versions.props
  4. 4
      global.json

3
Directory.Build.targets
View File

@ -80,8 +80,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<!-- Set RuntimeFrameworkVersion to MicrosoftNETCoreAppRuntimewinx64PackageVersion from Core Setup to prevent large SDK cycle -->
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRefPackageVersion)'!='' And $(TargetFramework.StartsWith('$(RedistTargetFrameworkName)')) ">$(MicrosoftNETCoreAppRefPackageVersion)</RuntimeFrameworkVersion>
<!-- If TargetFramework is not net8.x, then reset RuntimeFrameworkVersion --> <!-- If TargetFramework is not net8.x, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" /> <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" />

8
eng/Version.Details.xml
View File

@ -8,10 +8,6 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Dependencies> <Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="85778473549347b3e4bad3ea009e9438df7b11bb" BarId="267776" /> <Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="85778473549347b3e4bad3ea009e9438df7b11bb" BarId="267776" />
<ProductDependencies> <ProductDependencies>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25260.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25260.104"> <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25260.104">
<Uri>https://github.com/dotnet/dotnet</Uri> <Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha> <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
<Uri>https://github.com/dotnet/dotnet</Uri> <Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha> <Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25260.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25260.104"> <Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25260.104">
<Uri>https://github.com/dotnet/dotnet</Uri> <Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha> <Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>

2
eng/Versions.props
View File

@ -15,7 +15,6 @@
</PropertyGroup> </PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro --> <!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup> <PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25260.104</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25260.104</SystemFormatsNrbfPackageVersion> <SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25260.104</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.5.25260.104</SystemIOHashingPackageVersion> <SystemIOHashingPackageVersion>10.0.0-preview.5.25260.104</SystemIOHashingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
@ -24,7 +23,6 @@
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25260.104</SystemRuntimeSerializationFormattersPackageVersion> <SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25260.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.5.25260.104</SystemTextJsonPackageVersion> <SystemTextJsonPackageVersion>10.0.0-preview.5.25260.104</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftWin32SystemEventsPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25260.104</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.5.25260.104</SystemCodeDomPackageVersion> <SystemCodeDomPackageVersion>10.0.0-preview.5.25260.104</SystemCodeDomPackageVersion>

4
global.json
View File

@ -3,10 +3,10 @@
"dotnet": "10.0.100-preview.3.25201.16", "dotnet": "10.0.100-preview.3.25201.16",
"runtimes": { "runtimes": {
"dotnet/x64": [ "dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
"$(MicrosoftNETCorePlatformsPackageVersion)"
], ],
"dotnet/x86": [ "dotnet/x86": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
"$(MicrosoftNETCorePlatformsPackageVersion)"
] ]
} }
}, },

Write Preview
Loading…
Cancel
Save