Skip to content

Commit 43d52c4

Browse files
[main] Source code updates from dotnet/dotnet (#9163)
* [VMR] Codeflow 86117ef-be6b7b2 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 275021 Updated Dependencies: System.CommandLine (Version 2.0.0-beta6.25360.101 -> 2.0.0-beta7.25362.103) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25360.101 -> 10.0.0-beta.25362.103) * Update dependencies from https://github.com/dotnet/dotnet build 275039 Updated Dependencies: System.CommandLine (Version 2.0.0-beta7.25362.103 -> 2.0.0-beta7.25363.101) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25362.103 -> 10.0.0-beta.25363.101) * Ajust following the change to dotnet/command-line-api --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
1 parent be6b7b2 commit 43d52c4

File tree

5 files changed

+9
-19
lines changed

5 files changed

+9
-19
lines changed

.editorconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ dotnet_diagnostic.IDE0032.severity = suggestion
202202
dotnet_diagnostic.IDE0040.severity = suggestion
203203
#Use conditional expression for return
204204
dotnet_diagnostic.IDE0046.severity = suggestion
205-
#false positives, see https://github.com/dotnet/roslyn/issues/79286
206-
dotnet_diagnostic.IDE0048.severity = silent
207205
#Remove unused private member
208206
dotnet_diagnostic.IDE0051.severity = suggestion
209207
#Remove unnecessary expression value
@@ -683,4 +681,4 @@ dotnet_analyzer_diagnostic.severity = none
683681
insert_final_newline = false
684682

685683
[test/**/{Approvals,Snapshots}/**]
686-
trim_trailing_whitespace = false
684+
trim_trailing_whitespace = false

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="86117ef4343bab700dab871c416e55b22848cd52" BarId="274788" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="0b032b9f942c1ae8de535a434c4f4a9206fd3339" BarId="275039" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25360.101">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25363.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
7+
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25360.101">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25363.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
13+
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<!-- Non-maestro versions -->
1717
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
18-
<SystemCommandLinePackageVersion>2.0.0-beta6.25360.101</SystemCommandLinePackageVersion>
18+
<SystemCommandLinePackageVersion>2.0.0-beta7.25363.101</SystemCommandLinePackageVersion>
1919
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
2020
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
2121
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dotnet": "10.0.100-preview.7.25322.101"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25360.101"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25363.101"
1717
}
1818
}

tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@ internal static Task<int> Main(string[] args)
1616
rootCommand.Subcommands.Add(new VerifyCommand());
1717
rootCommand.Subcommands.Add(new ValidateCommand());
1818

19-
return GetCommandLineConfiguration(rootCommand).InvokeAsync(args);
20-
}
21-
22-
internal static CommandLineConfiguration GetCommandLineConfiguration(Command command)
23-
{
24-
return new CommandLineConfiguration(command)
25-
{
26-
EnablePosixBundling = false
27-
};
19+
return rootCommand.Parse(args, new() { EnablePosixBundling = false }).InvokeAsync();
2820
}
2921
}
3022
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy