From 0d85cba8aa18b45826b467ac7939209ba8b6ad19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 02:03:39 +0000 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 7/8] 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 8/8] 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 @@ - - - - - - +