Skip to content

Commit 5a42929

Browse files
mmitchemmitche
authored
Fixes for stable builds, and move away from using arch-specific properties (#49017)
1 parent e07a38c commit 5a42929

File tree

7 files changed

+17
-55
lines changed

7 files changed

+17
-55
lines changed

‎Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
<!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. -->
8989
<PropertyGroup>
9090
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
91-
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92-
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93-
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94-
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
91+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
9595

9696
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
9797
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>

‎eng/Version.Details.xml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,6 @@
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
4343
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
46-
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
48-
</Dependency>
49-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-preview.5.25265.101">
50-
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
52-
</Dependency>
53-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
54-
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
56-
</Dependency>
57-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-preview.5.25265.101">
58-
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
60-
</Dependency>
6145
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25265.101">
6246
<Uri>https://github.com/dotnet/dotnet</Uri>
6347
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
@@ -238,20 +222,11 @@
238222
<Uri>https://github.com/dotnet/dotnet</Uri>
239223
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
240224
</Dependency>
241-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
242-
<Uri>https://github.com/dotnet/dotnet</Uri>
243-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
244-
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
245-
</Dependency>
246-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
247-
<Uri>https://github.com/dotnet/dotnet</Uri>
248-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
249-
</Dependency>
250225
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.5.25265.101">
251226
<Uri>https://github.com/dotnet/dotnet</Uri>
252227
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
253228
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.5.25265.101">
229+
<Dependency Name="Microsoft.WindowsDesktop.App.Internal" Version="10.0.0-preview.5.25265.101">
255230
<Uri>https://github.com/dotnet/dotnet</Uri>
256231
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
257232
</Dependency>
@@ -267,14 +242,6 @@
267242
<Uri>https://github.com/dotnet/dotnet</Uri>
268243
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
269244
</Dependency>
270-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
271-
<Uri>https://github.com/dotnet/dotnet</Uri>
272-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
273-
</Dependency>
274-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
275-
<Uri>https://github.com/dotnet/dotnet</Uri>
276-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
277-
</Dependency>
278245
<Dependency Name="dotnet-dev-certs" Version="10.0.0-preview.5.25265.101">
279246
<Uri>https://github.com/dotnet/dotnet</Uri>
280247
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>

‎eng/Versions.props

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@
102102
<PropertyGroup>
103103
<!-- Dependencies from https://github.com/dotnet/runtime -->
104104
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRefPackageVersion>
105-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
106-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
107105
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsDependencyModelPackageVersion>
108106
<MicrosoftNETHostModelVersion>10.0.0-preview.5.25265.101</MicrosoftNETHostModelVersion>
109107
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
@@ -115,9 +113,6 @@
115113
<SystemServiceProcessServiceControllerVersion>10.0.0-preview.5.25265.101</SystemServiceProcessServiceControllerVersion>
116114
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
117115
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25265.101</MicrosoftNETCorePlatformsPackageVersion>
118-
<VSRedistCommonWindowsDesktopTargetingPackx64100Version>10.0.0-preview.5.25265.101</VSRedistCommonWindowsDesktopTargetingPackx64100Version>
119-
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
120-
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppHostwinx64PackageVersion>
121116
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-preview.5.25265.101</MicrosoftBclAsyncInterfacesPackageVersion>
122117
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-preview.5.25265.101</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
123118
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25265.101</MicrosoftWin32SystemEventsPackageVersion>
@@ -155,8 +150,7 @@
155150
</PropertyGroup>
156151
<PropertyGroup>
157152
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
158-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
159-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.5.25265.101</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
153+
<MicrosoftWindowsDesktopAppInternalPackageVersion>10.0.0-preview.5.25265.101</MicrosoftWindowsDesktopAppInternalPackageVersion>
160154
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.5.25265.101</MicrosoftWindowsDesktopAppRefPackageVersion>
161155
</PropertyGroup>
162156
<PropertyGroup>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16",
44
"runtimes": {
55
"dotnet": [
6-
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
6+
"$(MicrosoftNETCorePlatformsPackageVersion)"
77
],
88
"aspnetcore": [
99
"$(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion)"

‎src/Layout/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<FullNugetVersion Condition="'$(VersionSuffixDateStamp)' != '' and '$(VersionSuffixBuildOfTheDay)' != ''">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
1515

1616
<PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
17-
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
17+
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
1818
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
1919

2020
<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>

‎src/Layout/redist/targets/Crossgen.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
2323
as will the archive file names themselves. -->
2424
<SharedFrameworkNameVersionPath Condition=" '$(PgoInstrument)' != 'true' ">$(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkNameVersionPath>
25-
<SharedFrameworkNameVersionPath Condition=" '$(PgoInstrument)' == 'true' ">$(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx64100PackageVersion)</SharedFrameworkNameVersionPath>
25+
<SharedFrameworkNameVersionPath Condition=" '$(PgoInstrument)' == 'true' ">$(RedistInstallerLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCorePlatformsPackageVersion)</SharedFrameworkNameVersionPath>
2626
</PropertyGroup>
2727

2828
<!-- This PropertyGroup contains the paths to the various SDK tooling that should be

‎src/Layout/redist/targets/RestoreLayout.targets

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@
1212

1313
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
1414
<!-- In unified build, the layout does match, so use the runtime package versions rather than the VS redist versions -->
15-
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCoreBlobVersion>
15+
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion>
1616
<NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion>
17-
<WindowsDesktopBlobVersion>$(VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion)</WindowsDesktopBlobVersion>
18-
<WindowsDesktopBlobVersion Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(MicrosoftWindowsDesktopAppRuntimePackageVersion)</WindowsDesktopBlobVersion>
17+
<WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppInternalPackageVersion)</WindowsDesktopBlobVersion>
1918
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
2019

2120
<AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x86'">x64</AlternateArchitecture>
2221
<AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x64'">x86</AlternateArchitecture>
2322
<DownloadedSharedHostInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
2423
<DownloadedHostFxrInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
2524
<DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' != 'true'">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
26-
<DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' == 'true'">dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
25+
<DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' == 'true'">dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(MicrosoftNETCorePlatformsPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
2726
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != ''">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
2827
<DownloadedNetCoreAppTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
2928
<DownloadedNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
@@ -40,7 +39,7 @@
4039
<SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
4140

4241
<CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' != 'true'">dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
43-
<CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
42+
<CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime$(PgoTerm)-$(MicrosoftNETCorePlatformsPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
4443
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
4544

4645
<AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
@@ -49,9 +48,11 @@
4948
<AspNetCoreInstallerRid Condition="'$(InstallerExtension)' == '.rpm' AND '$(TargetArchitecture)' == 'arm64'">aarch64</AspNetCoreInstallerRid>
5049

5150
<DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX'))">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
52-
<DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
51+
<!-- This should be using MicrosoftAspNetCoreAppRefInternalPackageVersion, https://github.com/dotnet/aspnetcore/issues/61951 -->
52+
<DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
5353
<DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
54-
<DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
54+
<!-- This should be using MicrosoftAspNetCoreAppRefInternalPackageVersion, https://github.com/dotnet/aspnetcore/issues/61951 -->
55+
<DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
5556
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
5657
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
5758

0 commit comments

Comments
 (0)