Skip to content

Commit f05a11c

Browse files
author
Mirroring
committed
Merge commit '932f3355678a69f200133a503beff3d4ac3f451a'
2 parents ba88488 + 932f335 commit f05a11c

File tree

4 files changed

+39
-25
lines changed

4 files changed

+39
-25
lines changed

‎NuGet.config‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c78f4a81/nuget/v3/index.json" />
1818
<!-- End: Package sources from dotnet-aspnetcore -->
1919
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
20-
<add key="darc-pub-DotNet-msbuild-Trusted-18f1ecf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-18f1ecf8/nuget/v3/index.json" />
20+
<add key="darc-pub-DotNet-msbuild-Trusted-70f0ec6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-70f0ec66/nuget/v3/index.json" />
2121
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2222
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2323
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -26,7 +26,12 @@
2626
<!-- End: Package sources from dotnet-runtime -->
2727
<!-- Begin: Package sources from dotnet-templating -->
2828
<add key="darc-pub-dotnet-templating-d108a65" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-d108a65-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-5/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-d108a65-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-4/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-templating-d108a65-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-3/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-d108a65-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-2/nuget/v3/index.json" />
2933
<add key="darc-pub-dotnet-templating-d108a65-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-1/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-a2c4545" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2c45457/nuget/v3/index.json" />
3035
<!-- End: Package sources from dotnet-templating -->
3136
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3237
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.414">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.415">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>d108a65d5ff4505b28bce684d565d01330472833</Sha>
6+
<Sha>a2c45457884ceb15ab6e368c87571ce1e480fc93</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.414-servicing.25414.4">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.415-servicing.25457.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>d108a65d5ff4505b28bce684d565d01330472833</Sha>
10+
<Sha>a2c45457884ceb15ab6e368c87571ce1e480fc93</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.414-servicing.25414.4">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.415-servicing.25457.4">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>d108a65d5ff4505b28bce684d565d01330472833</Sha>
14+
<Sha>a2c45457884ceb15ab6e368c87571ce1e480fc93</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.20">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>222749b48ecb0fe78f236ca9c61f6ff3b09cdc99</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.41">
58+
<Dependency Name="Microsoft.Build" Version="17.11.45">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>18f1ecf823d4498808757f7f183143157b136d12</Sha>
60+
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.41-servicing-25412-05">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.45-servicing-25452-07">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>18f1ecf823d4498808757f7f183143157b136d12</Sha>
64+
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.41-servicing-25412-05">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.45-servicing-25452-07">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>18f1ecf823d4498808757f7f183143157b136d12</Sha>
68+
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
@@ -354,9 +354,9 @@
354354
<Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25414.2">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25428.6">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>4f43a405d713b6e9b2963ebbac4850eae1804982</Sha>
359+
<Sha>0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.11.41</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.11.45</MicrosoftBuildPackageVersion>
130130
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
131131
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
132132
so target one that matches the version in minimumMSBuildVersion.
@@ -135,21 +135,21 @@
135135
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.11.41-servicing-25412-05</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.11.45-servicing-25452-07</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
142142
<MicrosoftNETStringToolsPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftNETStringToolsPackageVersion>
143143
</PropertyGroup>
144144
<PropertyGroup>
145145
<!-- Dependencies from https://github.com/dotnet/templating -->
146-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.414</MicrosoftTemplateEngineAbstractionsPackageVersion>
146+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.415</MicrosoftTemplateEngineAbstractionsPackageVersion>
147147
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
148148
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
149149
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
150150
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
151151
<!-- test dependencies -->
152-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.414-servicing.25414.4</MicrosoftTemplateEngineMocksPackageVersion>
152+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.415-servicing.25457.4</MicrosoftTemplateEngineMocksPackageVersion>
153153
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
154154
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
155155
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

‎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)