From 1131a93542f31de79602e5cb6db157edacbd2a8e Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 13 Sep 2021 12:01:04 -0700 Subject: [PATCH] [release/6.0.1xx] Tweaks for RTM stable building and servicing (#11938) * Tweaks for RTM stable building and servicing - When building from source offline in a stable configuration, the shared frameworks versions will match the directory from which the runtime archives are located in, both stable. This is in contrast to when not building from source, in which the runtime archives will appear in non-stable directories. - The targeting pack versions should not be assumed to always match the runtime framework versions, and the blob directories containing them are the same. Add new dependencies so that we can track where the targeting pack directory is over time. - PGO archives coming from runtime are always built non-stable. This means the download location needs to be tweaks, and crossgen calls need to look for shared framework binaries in the non-stable locations. - For source-build, the templating should move to a new non-stable dependency. This is used to determine the version of the source build intermediate package. * Generate the full nuget version in the source build tarball job. The source build tarball job needs the full nuget version so that it can publish the blob to the right location (`Sdk//source-.zip). This involves being able to call the GenerateFullNuGetVersion target and the targets it depends on. --- eng/Version.Details.xml | 12 +++++++++ eng/Versions.props | 2 ++ .../tools/SourceBuildArcadeTarball.targets | 8 ++++++ src/redist/targets/Crossgen.targets | 5 +++- src/redist/targets/GenerateLayout.targets | 25 +++++++++++++------ 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0325aa0f..57822d594 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,6 +9,10 @@ https://github.com/dotnet/windowsdesktop d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + + https://github.com/dotnet/windowsdesktop + d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + https://github.com/dotnet/windowsdesktop d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c @@ -21,6 +25,10 @@ https://github.com/dotnet/runtime 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + + https://github.com/dotnet/runtime + 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + https://github.com/dotnet/runtime 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee @@ -84,6 +92,10 @@ https://github.com/dotnet/templating 79209eac8a27bcabf5a064a88abb95f32b91d863 + + + https://github.com/dotnet/templating + 79209eac8a27bcabf5a064a88abb95f32b91d863 diff --git a/eng/Versions.props b/eng/Versions.props index c7b180543..1990e1c7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,6 +70,7 @@ 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21460.8 6.0.0-rc.2.21460.8 6.0.0-rc.2.21460.8 6.0.0-rc.2.21460.8 @@ -79,6 +80,7 @@ 6.0.0-rc.2.21459.14 + 6.0.0-rc.2.21459.14 6.0.0-rc.2.21459.14 6.0.0-rc.2.21459.14 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 3773f2e21..dfa256387 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -3,6 +3,12 @@ + + + + + + @@ -16,6 +22,8 @@ $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(VSRedistCommonNetCoreTargetingPackx6460PackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 4c1d72cbb..26ada8fd0 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -7,14 +7,23 @@ - $(MicrosoftAspNetCoreAppRuntimePackageVersion) - $(MicrosoftNETCoreAppRuntimePackageVersion) + + $(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) + + $(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) + $(VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion) - - $(CoreSetupBlobVersion) + + + $(VSRedistCommonNetCoreTargetingPackx6460PackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(WindowsDesktopBlobVersion) + $(VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion) 3.0.0 @@ -49,7 +58,8 @@ x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -70,7 +80,8 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime$(PgoTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid)