From cce77edfe1b0d5b3f30a60bd4b917f0591dc06d0 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 14 Sep 2021 14:59:33 -0700 Subject: [PATCH] [main] Tweaks for RTM stable building and servicing (#11936) * 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. * Use correct package version prop for crossgen targets --- 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 347796374..54282eba2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,6 +9,10 @@ https://github.com/dotnet/windowsdesktop f10a0994b775e50974e028194f1c27790a7cea00 + + https://github.com/dotnet/windowsdesktop + f10a0994b775e50974e028194f1c27790a7cea00 + https://github.com/dotnet/windowsdesktop f10a0994b775e50974e028194f1c27790a7cea00 @@ -21,6 +25,10 @@ https://github.com/dotnet/runtime e9108608eacb3a40a5a0ee6278e60de71a00a59d + + https://github.com/dotnet/runtime + e9108608eacb3a40a5a0ee6278e60de71a00a59d + https://github.com/dotnet/runtime e9108608eacb3a40a5a0ee6278e60de71a00a59d @@ -84,6 +92,10 @@ https://github.com/dotnet/templating dee13998a1d3318ab7363aaa7c8b095d3e58e66b + + + https://github.com/dotnet/templating + dee13998a1d3318ab7363aaa7c8b095d3e58e66b diff --git a/eng/Versions.props b/eng/Versions.props index 9784e7906..ec1d6174a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,6 +70,7 @@ 7.0.0-alpha.1.21425.4 + 7.0.0-alpha.1.21425.4 7.0.0-alpha.1.21425.4 7.0.0-alpha.1.21425.4 7.0.0-alpha.1.21425.4 @@ -79,6 +80,7 @@ 7.0.0-alpha.1.21426.12 + 7.0.0-alpha.1.21426.12 7.0.0-alpha.1.21426.12 7.0.0-alpha.1.21426.12 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 321c0013b..b9e415dce 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)/$(VSRedistCommonNetCoreTargetingPackx6470PackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 177c1488f..319103859 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -7,14 +7,23 @@ - $(MicrosoftAspNetCoreAppRuntimePackageVersion) - $(MicrosoftNETCoreAppRuntimePackageVersion) + + $(VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) + + $(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) + $(VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion) - - $(CoreSetupBlobVersion) + + + $(VSRedistCommonNetCoreTargetingPackx6470PackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(WindowsDesktopBlobVersion) + $(VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion) 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)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(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)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid)