Skip to content

Commit 70ea017

Browse files
f-alizadaf-alizada
authored
Merge branch 'main' into dev/f-alizada/add-automation-for-respect-custom-culture-property
2 parents 1df75e8 + f5a5171 commit 70ea017

File tree

10 files changed

+152
-152
lines changed

10 files changed

+152
-152
lines changed

‎CODEOWNERS

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
5353

5454
# Area-Templates
55-
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
56-
/src/Cli/dotnet-new3 @dotnet/templating-engine-maintainers
57-
/src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
55+
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
56+
/src/Cli/dotnet-new3 @dotnet/templating-engine-maintainers
57+
/src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
5858
/test/dotnet-new.Tests @dotnet/templating-engine-maintainers
59-
/test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
60-
/template_feed @dotnet/templating-engine-maintainers
59+
/test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
60+
/template_feed @dotnet/templating-engine-maintainers
6161

6262
# ILLink and ReadyToRun targets and tasks owned by runtime team
6363
# Area-ILLink Area-ReadyToRun
@@ -72,12 +72,12 @@
7272
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
7373

7474
# Area-Watch
75-
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
76-
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
77-
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
78-
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide
79-
/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
80-
/src/BuiltInTools/AspireService @BillHiebert @dotnet/aspnet-blazor-eng
75+
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
76+
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
77+
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
78+
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide
79+
/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
80+
/src/BuiltInTools/AspireService @BillHiebert @dotnet/aspnet-blazor-eng
8181

8282
# Compatibility tools owned by runtime team
8383
/src/Compatibility/ @dotnet/area-infrastructure-libraries
@@ -86,10 +86,10 @@
8686
/test/Microsoft.DotNet.PackageValidation*/ @dotnet/area-infrastructure-libraries
8787

8888
# Area-GenAPI
89-
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
90-
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries @andriipatsula
91-
/test/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
92-
/test/Microsoft.DotNet.ApiSymbolExtensions.Tests/
89+
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries
90+
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries
91+
/test/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries
92+
/test/Microsoft.DotNet.ApiSymbolExtensions.Tests/ @dotnet/area-infrastructure-libraries
9393

9494
# Area: dotnet containers
9595
/src/Cli/Containers @dotnet/sdk-container-builds-maintainers

‎eng/Version.Details.xml

Lines changed: 76 additions & 76 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@
207207
then use that in Directory.Packages.props.
208208
209209
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
210-
<MicrosoftBuildVersion>17.12.0-preview-24365-02</MicrosoftBuildVersion>
211-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24365-02</MicrosoftBuildLocalizationVersion>
210+
<MicrosoftBuildVersion>17.12.0-preview-24366-01</MicrosoftBuildVersion>
211+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24366-01</MicrosoftBuildLocalizationVersion>
212212
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
215215
<!-- Dependencies from https://github.com/dotnet/templating -->
216-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24364.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
216+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24366.7</MicrosoftTemplateEngineAbstractionsPackageVersion>
217217
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
218218
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
219219
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
220220
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
221221
<!-- test dependencies -->
222-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24364.1</MicrosoftTemplateEngineMocksPackageVersion>
222+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24366.7</MicrosoftTemplateEngineMocksPackageVersion>
223223
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
224224
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
225225
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -230,36 +230,36 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24365.10</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24365.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24366.3</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24366.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
244-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRefPackageVersion>
245-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreTestHostPackageVersion>
251-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24365.9</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24365.9</dotnetdevcertsPackageVersion>
255-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24365.9</dotnetuserjwtsPackageVersion>
256-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24365.9</dotnetusersecretsPackageVersion>
244+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRefPackageVersion>
245+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
250+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreTestHostPackageVersion>
251+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254+
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24366.1</dotnetdevcertsPackageVersion>
255+
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24366.1</dotnetuserjwtsPackageVersion>
256+
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24366.1</dotnetusersecretsPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/razor -->
260-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24365.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24365.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24365.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
260+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24366.7</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24366.7</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24366.7</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->

‎src/Cli/dotnet/commands/dotnet-help/HelpCommand.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,17 @@
88

99
namespace Microsoft.DotNet.Tools.Help
1010
{
11-
public class HelpCommand
11+
public class HelpCommand(string[] helpArgs)
1212
{
13-
private readonly ParseResult _parseResult;
14-
15-
public HelpCommand(ParseResult parseResult)
16-
{
17-
_parseResult = parseResult;
18-
}
19-
2013
public static int Run(ParseResult result)
2114
{
2215
result.HandleDebugSwitch();
2316

2417
result.ShowHelpOrErrorIfAppropriate();
2518

26-
if (!string.IsNullOrEmpty(result.GetValue(HelpCommandParser.Argument)))
19+
if (result.GetValue(HelpCommandParser.Argument) is string[] args && args is not [])
2720
{
28-
return new HelpCommand(result).Execute();
21+
return new HelpCommand(args).Execute();
2922
}
3023

3124
PrintHelp();
@@ -85,7 +78,7 @@ public static Process ConfigureProcess(string docUrl)
8578
public int Execute()
8679
{
8780
if (TryGetDocsLink(
88-
_parseResult.GetValue(HelpCommandParser.Argument),
81+
helpArgs,
8982
out var docsLink) &&
9083
!string.IsNullOrEmpty(docsLink))
9184
{
@@ -99,18 +92,18 @@ public int Execute()
9992
Reporter.Error.WriteLine(
10093
string.Format(
10194
LocalizableStrings.CommandDoesNotExist,
102-
_parseResult.GetValue(HelpCommandParser.Argument)).Red());
95+
helpArgs).Red());
10396
Reporter.Output.WriteLine(HelpUsageText.UsageText);
10497
return 1;
10598
}
10699
}
107100

108-
private bool TryGetDocsLink(string commandName, out string docsLink)
101+
private bool TryGetDocsLink(string[] command, out string docsLink)
109102
{
110-
var command = Parser.GetBuiltInCommand(commandName);
111-
if (command != null && command as DocumentedCommand != null)
103+
var parsedCommand = Parser.Instance.Parse(["dotnet", .. command]);
104+
if (parsedCommand?.CommandResult?.Command is DocumentedCommand dc)
112105
{
113-
docsLink = (command as DocumentedCommand).DocsLink;
106+
docsLink = dc.DocsLink;
114107
return true;
115108
}
116109
docsLink = null;

‎src/Cli/dotnet/commands/dotnet-help/HelpCommandParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ internal static class HelpCommandParser
1010
{
1111
public static readonly string DocsLink = "https://aka.ms/dotnet-help";
1212

13-
public static readonly CliArgument<string> Argument = new(LocalizableStrings.CommandArgumentName)
13+
public static readonly CliArgument<string[]> Argument = new(LocalizableStrings.CommandArgumentName)
1414
{
1515
Description = LocalizableStrings.CommandArgumentDescription,
16-
Arity = ArgumentArity.ZeroOrOne
16+
Arity = ArgumentArity.ZeroOrMore
1717
};
1818

1919
private static readonly CliCommand Command = ConstructCommand();

‎src/Cli/dotnet/commands/dotnet-nuget/NuGetCommandParser.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ private static CliCommand GetTrustCommand()
125125
CliOption<bool> allowUntrustedRoot = new("--allow-untrusted-root");
126126
CliOption<string> owners = new("--owners");
127127

128-
trustCommand.Subcommands.Add (new CliCommand("list"));
129-
trustCommand.Subcommands.Add (AuthorCommand());
130-
trustCommand.Subcommands.Add (RepositoryCommand());
131-
trustCommand.Subcommands.Add (SourceCommand());
132-
trustCommand.Subcommands.Add (CertificateCommand());
133-
trustCommand.Subcommands.Add (RemoveCommand());
134-
trustCommand.Subcommands.Add (SyncCommand());
128+
trustCommand.Subcommands.Add(new CliCommand("list"));
129+
trustCommand.Subcommands.Add(AuthorCommand());
130+
trustCommand.Subcommands.Add(RepositoryCommand());
131+
trustCommand.Subcommands.Add(SourceCommand());
132+
trustCommand.Subcommands.Add(CertificateCommand());
133+
trustCommand.Subcommands.Add(RemoveCommand());
134+
trustCommand.Subcommands.Add(SyncCommand());
135135

136136
CliOption<string> configFile = new("--configfile");
137137

@@ -168,7 +168,8 @@ private static CliCommand GetTrustCommand()
168168
new CliOption<string>("--source-url"),
169169
};
170170

171-
CliCommand CertificateCommand() {
171+
CliCommand CertificateCommand()
172+
{
172173
CliOption<string> algorithm = new("--algorithm")
173174
{
174175
DefaultValueFactory = (_argResult) => "SHA256"
@@ -220,8 +221,7 @@ private static CliCommand GetSignCommand()
220221

221222
private static CliCommand GetWhyCommand()
222223
{
223-
CliCommand whyCommand = new("why");
224-
224+
DocumentedCommand whyCommand = new("why", "https://learn.microsoft.com/dotnet/core/tools/dotnet-nuget-why");
225225
whyCommand.Arguments.Add(new CliArgument<string>("PROJECT|SOLUTION") { Arity = ArgumentArity.ExactlyOne });
226226
whyCommand.Arguments.Add(new CliArgument<string>("PACKAGE") { Arity = ArgumentArity.ExactlyOne });
227227

@@ -230,7 +230,6 @@ private static CliCommand GetWhyCommand()
230230
.AllowSingleArgPerToken());
231231

232232
whyCommand.SetAction(NuGetCommand.Run);
233-
234233
return whyCommand;
235234
}
236235
}

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ public void ExecuteRun(string projectName) =>
216216

217217
public void ExecuteRunWeb(string projectName, DotNetTemplate template)
218218
{
219-
// 'dotnet run' exit code differs between CoreCLR and Mono (https://github.com/dotnet/sdk/issues/30095).
220-
int expectedExitCode = IsMonoRuntime ? 143 : 0;
219+
int expectedExitCode = 0;
221220

222221
ExecuteWeb(
223222
projectName,

‎src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ Integration with static web assets:
8383

8484
</PropertyGroup>
8585

86+
<PropertyGroup>
87+
88+
<GenerateComputedBuildStaticWebAssetsDependsOn Condition="'$(DisableScopedCssBundling)' != 'true'">
89+
$(GenerateComputedBuildStaticWebAssetsDependsOn);
90+
BundleScopedCssFiles;
91+
</GenerateComputedBuildStaticWebAssetsDependsOn>
92+
93+
</PropertyGroup>
94+
8695
<Target Name="GenerateScopedCssFiles" DependsOnTargets="$(GenerateScopedCssFilesDependsOn)" />
8796

8897
<Target Name="ResolveScopedCssAssets" DependsOnTargets="$(ResolveScopedCssAssetsDependsOn)">

‎src/StaticWebAssetsSdk/Tasks/Data/StaticWebAsset.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ internal static (string fingerprint, string integrity) ComputeFingerprintAndInte
249249

250250
internal static string ComputeIntegrity(string identity, string originalItemSpec)
251251
{
252-
var file = File.Exists(identity) ?
252+
using var file = File.Exists(identity) ?
253253
File.OpenRead(identity) :
254254
(File.Exists(originalItemSpec) ?
255255
File.OpenRead(originalItemSpec) :

‎test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetHelpCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class GivenThatIWantToShowHelpForDotnetHelpCommand : SdkTest
1010
.NET CLI help utility
1111
1212
Usage:
13-
dotnet help [<COMMAND_NAME>] [options]
13+
dotnet help [<COMMAND_NAME>...] [options]
1414
1515
Arguments:
1616
<COMMAND_NAME> The SDK command to launch online help for.

0 commit comments

Comments
 (0)