Skip to content

Commit 830499d

Browse files
authored
[8.0.4xx] detect .NET 10 RID-specific tools and provide a more actionable error (#50414)
1 parent 6d798be commit 830499d

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,24 @@ public static ToolConfiguration Deserialize(string pathToXml)
5252
throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand);
5353
}
5454

55-
if (dotNetCliTool.Commands[0].Runner != "dotnet")
55+
// if there is no runner, this could be an entirely different _kind_ of tool.
56+
if (string.IsNullOrWhiteSpace(dotNetCliTool.Commands[0].Runner))
5657
{
57-
throw new ToolConfigurationException(
58-
string.Format(
59-
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
60-
dotNetCliTool.Commands[0].Name,
61-
dotNetCliTool.Commands[0].Runner));
58+
if (warnings.Count != 0)
59+
{
60+
throw new ToolConfigurationException(warnings[0]);
61+
}
6262
}
6363

64+
if (dotNetCliTool.Commands[0].Runner != "dotnet")
65+
{
66+
throw new ToolConfigurationException(
67+
string.Format(
68+
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
69+
dotNetCliTool.Commands[0].Name,
70+
dotNetCliTool.Commands[0].Runner));
71+
}
72+
6473
return new ToolConfiguration(
6574
dotNetCliTool.Commands[0].Name,
6675
dotNetCliTool.Commands[0].EntryPoint,

0 commit comments

Comments
 (0)