From 0d85cba8aa18b45826b467ac7939209ba8b6ad19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 02:03:39 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/templating build 20250817.9 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.414-servicing.25414.4 -> To Version 8.0.414-servicing.25417.9 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb68040e5d6f..f08dbe21019e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a811669eb9ac..8b36894a6056 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - d108a65d5ff4505b28bce684d565d01330472833 + 31416ebeb877a43190a5aaa24b1ddacf1f75a576 - + https://github.com/dotnet/templating - d108a65d5ff4505b28bce684d565d01330472833 + 31416ebeb877a43190a5aaa24b1ddacf1f75a576 - + https://github.com/dotnet/templating - d108a65d5ff4505b28bce684d565d01330472833 + 31416ebeb877a43190a5aaa24b1ddacf1f75a576 diff --git a/eng/Versions.props b/eng/Versions.props index 571d8748a5f6..30da269b826c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.414-servicing.25414.4 + 8.0.414-servicing.25417.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 96cb7cf2a8eef795349a92cd54031a6aed60e4a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Aug 2025 02:03:41 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/msbuild build 20250819.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.41-servicing-25412-05 -> To Version 17.11.41-servicing-25419-01 --- NuGet.config | 3 ++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb68040e5d6f..b6e9ada2a2f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -23,6 +23,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a811669eb9ac..6700dba5373e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,15 +57,15 @@ https://github.com/dotnet/msbuild - 18f1ecf823d4498808757f7f183143157b136d12 + 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d - + https://github.com/dotnet/msbuild - 18f1ecf823d4498808757f7f183143157b136d12 + 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d - + https://github.com/dotnet/msbuild - 18f1ecf823d4498808757f7f183143157b136d12 + 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d diff --git a/eng/Versions.props b/eng/Versions.props index 571d8748a5f6..47ad849e33f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ 17.8.27 $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildMinimumVersion) - 17.11.41-servicing-25412-05 + 17.11.41-servicing-25419-01 $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildTasksCorePackageVersion) From 8542d52969dba264394bb0633328dab85f979bff Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 20 Aug 2025 15:23:37 -0500 Subject: [PATCH 03/12] detect .NET 10 RID-specific tools and provide a more actionable error --- .../ToolConfigurationDeserializer.cs | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs b/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs index a0f27e20f61e..7cb83224e6bd 100644 --- a/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs +++ b/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs @@ -52,15 +52,24 @@ public static ToolConfiguration Deserialize(string pathToXml) throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand); } - if (dotNetCliTool.Commands[0].Runner != "dotnet") + // if there is no runner, this could be an entirely different _kind_ of tool. + if (string.IsNullOrWhiteSpace(dotNetCliTool.Commands[0].Runner)) { - throw new ToolConfigurationException( - string.Format( - CommonLocalizableStrings.ToolSettingsUnsupportedRunner, - dotNetCliTool.Commands[0].Name, - dotNetCliTool.Commands[0].Runner)); + if (warnings.Count != 0) + { + throw new ToolConfigurationException(warnings[0]); + } } + if (dotNetCliTool.Commands[0].Runner != "dotnet") + { + throw new ToolConfigurationException( + string.Format( + CommonLocalizableStrings.ToolSettingsUnsupportedRunner, + dotNetCliTool.Commands[0].Name, + dotNetCliTool.Commands[0].Runner)); + } + return new ToolConfiguration( dotNetCliTool.Commands[0].Name, dotNetCliTool.Commands[0].EntryPoint, From 66010f39f9da4227807db5b3617912c780595064 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Aug 2025 02:03:31 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/msbuild build 20250826.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.41-servicing-25412-05 -> To Version 17.11.43-servicing-25426-06 --- NuGet.config | 5 ++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b6e9ada2a2f9..96ffe6019ded 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -23,6 +23,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6700dba5373e..eebea6b0b4f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d + 784778a73daf2c86360a99798fe4dd1f9dde0366 - + https://github.com/dotnet/msbuild - 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d + 784778a73daf2c86360a99798fe4dd1f9dde0366 - + https://github.com/dotnet/msbuild - 9b5d41e2dfd9f25adbec359c1487a0ee05239b7d + 784778a73daf2c86360a99798fe4dd1f9dde0366 diff --git a/eng/Versions.props b/eng/Versions.props index 47ad849e33f9..d11089b9b32b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.11.41 + 17.11.43 $(MicrosoftBuildPackageVersion) - + @@ -23,6 +23,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eebea6b0b4f7..84e688b93344 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 784778a73daf2c86360a99798fe4dd1f9dde0366 + 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 - + https://github.com/dotnet/msbuild - 784778a73daf2c86360a99798fe4dd1f9dde0366 + 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 - + https://github.com/dotnet/msbuild - 784778a73daf2c86360a99798fe4dd1f9dde0366 + 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 diff --git a/eng/Versions.props b/eng/Versions.props index d11089b9b32b..b9268d03b63d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.11.43 + 17.11.45 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b36894a6056..263bef350671 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 31416ebeb877a43190a5aaa24b1ddacf1f75a576 + 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 - + https://github.com/dotnet/templating - 31416ebeb877a43190a5aaa24b1ddacf1f75a576 + 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 - + https://github.com/dotnet/templating - 31416ebeb877a43190a5aaa24b1ddacf1f75a576 + 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 diff --git a/eng/Versions.props b/eng/Versions.props index 30da269b826c..7a6c2148f044 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.414 + 8.0.415 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.414-servicing.25417.9 + 8.0.415-servicing.25452.13 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2d4d8b6a0d8a76ddf54469faa5e97c9c54a535ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Sep 2025 02:03:40 +0000 Subject: [PATCH 07/12] Update dependencies from https://github.com/dotnet/templating build 20250907.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.414-servicing.25414.4 -> To Version 8.0.415-servicing.25457.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a340e3afb46..7c4ca7e0d182 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 263bef350671..f2c228032e34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 + a2c45457884ceb15ab6e368c87571ce1e480fc93 - + https://github.com/dotnet/templating - 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 + a2c45457884ceb15ab6e368c87571ce1e480fc93 - + https://github.com/dotnet/templating - 9c1d9e51e7dc26896fb41555cc2f01fb89334c35 + a2c45457884ceb15ab6e368c87571ce1e480fc93 diff --git a/eng/Versions.props b/eng/Versions.props index ba6db5d5c516..f75982ea3ffb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.415-servicing.25452.13 + 8.0.415-servicing.25457.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0d035bebd9feed8bd0539b2fd00479dd38484cb0 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 11 Sep 2025 10:57:14 +0800 Subject: [PATCH 08/12] Revert the incorrect merge --- NuGet.config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a7e2bcab6c9..7c4ca7e0d182 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,12 +22,7 @@ - - - - - - + From 04f21e35e43e7cc7c0f15f69c0c20b15e627f9f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:04:30 +0000 Subject: [PATCH 09/12] Update dependencies from https://github.com/dotnet/roslyn build 20250915.8 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25429.5 -> To Version 4.14.0-3.25465.8 Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25429.5 -> To Version 3.12.0-beta1.25465.8 --- NuGet.config | 9 --------- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6eac10e3d17d..0c39881e967d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,14 +33,10 @@ - - - - @@ -73,13 +67,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3524856278e5..63c107953777 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - abf2d47471ab515fb98601c40dfa5d4869f0e25b + b0a9adbf61d6fb6ef4e53e09555fa6b6f189fcef diff --git a/eng/Versions.props b/eng/Versions.props index ea384a5ba4d5..89a5a530a19b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25429.5 + 3.12.0-beta1.25465.8 @@ -206,14 +206,14 @@ - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 - 4.14.0-3.25429.5 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 + 4.14.0-3.25465.8 From 66991c9e5144a585dc7e12e0def3f784cf021abf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 06:41:26 +0000 Subject: [PATCH 10/12] Update dependencies from https://github.com/dotnet/templating build 20250915.10 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.305 -> To Version 9.0.306 Microsoft.TemplateEngine.Mocks From Version 9.0.305-servicing.25458.1 -> To Version 9.0.306-servicing.25465.10 --- NuGet.config | 10 +--------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6eac10e3d17d..55c20667d362 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,14 +33,11 @@ - - - + - @@ -73,13 +68,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3524856278e5..f68b4abc1475 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - b252e9480d0f759f471ed9e53e02aa3506ff1ebc + f630f0370e54f47e47dff4a6997a016db9528ab2 - + https://github.com/dotnet/templating - b252e9480d0f759f471ed9e53e02aa3506ff1ebc + f630f0370e54f47e47dff4a6997a016db9528ab2 diff --git a/eng/Versions.props b/eng/Versions.props index ea384a5ba4d5..42aeecca77a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,13 +189,13 @@ - 9.0.305 + 9.0.306 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25458.1 + 9.0.306-servicing.25465.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 381004d1fb77bda2a1942da1e7fd35810ff22187 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Tue, 16 Sep 2025 15:45:09 +0800 Subject: [PATCH 11/12] Restore the changes on NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 0c39881e967d..55c20667d362 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,6 +35,7 @@ + From f3eefea9bf4192c6a55ce0a0ab07f502a9433b7e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 07:32:36 -0700 Subject: [PATCH 12/12] [release/9.0.3xx] Make duplicate deb/rpm packages so we can sign them with the new PMC key (#50910) Co-authored-by: Jeremy Koritzinsky --- .../redist-installer/targets/GenerateDebs.targets | 12 +++++++++--- .../redist-installer/targets/GenerateRPMs.targets | 7 +++++++ .../targets/GetRuntimeInformation.targets | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Installer/redist-installer/targets/GenerateDebs.targets b/src/Installer/redist-installer/targets/GenerateDebs.targets index 1cccb4fd0fa2..c5ef76b47e3f 100644 --- a/src/Installer/redist-installer/targets/GenerateDebs.targets +++ b/src/Installer/redist-installer/targets/GenerateDebs.targets @@ -92,6 +92,7 @@ $(ArtifactsShippingPackagesDir) $(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) + $(InstallerOutputDirectory)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(IntermediateOutputPath)debian/sdk/ $(SdkDebianIntermediateDirectory)deb-tool-output $(SdkDebianIntermediateDirectory)debian-testResults.xml @@ -220,7 +221,7 @@ $(AspNetSimpleVersion.LastIndexOf('.')) $(AspNetSimpleVersion.Substring(0, $(AspNetVersionPatchSeparator))) - + --ignore-depends=dotnet-runtime-$(AspNetSimpleVersion) @@ -315,7 +316,12 @@ OverwriteReadOnlyFiles="True" SkipUnchangedFiles="False" UseHardlinksIfPossible="False" /> - + @@ -374,7 +380,7 @@ --> - + diff --git a/src/Installer/redist-installer/targets/GenerateRPMs.targets b/src/Installer/redist-installer/targets/GenerateRPMs.targets index 47e160067dad..ba962e227ab8 100644 --- a/src/Installer/redist-installer/targets/GenerateRPMs.targets +++ b/src/Installer/redist-installer/targets/GenerateRPMs.targets @@ -200,6 +200,12 @@ OverwriteReadOnlyFiles="True" SkipUnchangedFiles="False" UseHardlinksIfPossible="False" /> + + $(SdkRPMInstallerFile) $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/Installer/redist-installer/targets/GetRuntimeInformation.targets b/src/Installer/redist-installer/targets/GetRuntimeInformation.targets index db1510b166c0..8361ccd2854f 100644 --- a/src/Installer/redist-installer/targets/GetRuntimeInformation.targets +++ b/src/Installer/redist-installer/targets/GetRuntimeInformation.targets @@ -54,6 +54,8 @@ $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture) + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-newkey-$(InstallerTargetArchitecture)