From e0e96c9adca415fe2b6493772f7112fb54ea9962 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 13 Jul 2025 02:02:23 +0000 Subject: [PATCH 1/4] [VMR] Codeflow 86117ef-be6b7b2 [[ commit created by automation ]] --- .editorconfig | 4 +--- .../Microsoft.TemplateEngine.Authoring.CLI/Program.cs | 11 +++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.editorconfig b/.editorconfig index c3b410cfb0b..bc46cb200f8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -202,8 +202,6 @@ dotnet_diagnostic.IDE0032.severity = suggestion dotnet_diagnostic.IDE0040.severity = suggestion #Use conditional expression for return dotnet_diagnostic.IDE0046.severity = suggestion -#false positives, see https://github.com/dotnet/roslyn/issues/79286 -dotnet_diagnostic.IDE0048.severity = silent #Remove unused private member dotnet_diagnostic.IDE0051.severity = suggestion #Remove unnecessary expression value @@ -683,4 +681,4 @@ dotnet_analyzer_diagnostic.severity = none insert_final_newline = false [test/**/{Approvals,Snapshots}/**] -trim_trailing_whitespace = false \ No newline at end of file +trim_trailing_whitespace = false diff --git a/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs b/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs index cca23cfff06..00a3597b35d 100644 --- a/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs +++ b/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs @@ -16,15 +16,10 @@ internal static Task Main(string[] args) rootCommand.Subcommands.Add(new VerifyCommand()); rootCommand.Subcommands.Add(new ValidateCommand()); - return GetCommandLineConfiguration(rootCommand).InvokeAsync(args); - } - - internal static CommandLineConfiguration GetCommandLineConfiguration(Command command) - { - return new CommandLineConfiguration(command) + return rootCommand.Parse(args, new CommandLineConfiguration(rootCommand) { - EnablePosixBundling = false - }; + EnablePosixBundling = false, + }).InvokeAsync(); } } } From 452354e6b955b2eac18e19de6baa0c080b57303d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 13 Jul 2025 02:02:24 +0000 Subject: [PATCH 2/4] 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) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 653d9eac9a5..d8c6848bd53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d diff --git a/eng/Versions.props b/eng/Versions.props index 7c791de394a..4270185f74a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 9.0.3 - 2.0.0-beta6.25360.101 + 2.0.0-beta7.25362.103 9.0.3 9.0.3 9.0.3 diff --git a/global.json b/global.json index 9c80c39c516..1b268f1f12d 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-preview.7.25322.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25360.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25362.103" } } From 97d860025e42d80919de8416555c07334eb9b640 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Jul 2025 02:02:38 +0000 Subject: [PATCH 3/4] 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) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8c6848bd53..0739db91bad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - f65cc9c656ea330c50ed30694c4b0834489f7f6d + 0b032b9f942c1ae8de535a434c4f4a9206fd3339 - + https://github.com/dotnet/dotnet - f65cc9c656ea330c50ed30694c4b0834489f7f6d + 0b032b9f942c1ae8de535a434c4f4a9206fd3339 diff --git a/eng/Versions.props b/eng/Versions.props index 4270185f74a..cfad649c188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 9.0.3 - 2.0.0-beta7.25362.103 + 2.0.0-beta7.25363.101 9.0.3 9.0.3 9.0.3 diff --git a/global.json b/global.json index 1b268f1f12d..2a7fe81c5c9 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-preview.7.25322.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25362.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25363.101" } } From d3807f9903e448af3a564ac3fcc00c706248094b Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Mon, 14 Jul 2025 09:21:43 +0000 Subject: [PATCH 4/4] Ajust following the change to dotnet/command-line-api --- tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs b/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs index 00a3597b35d..8656226e120 100644 --- a/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs +++ b/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs @@ -16,10 +16,7 @@ internal static Task Main(string[] args) rootCommand.Subcommands.Add(new VerifyCommand()); rootCommand.Subcommands.Add(new ValidateCommand()); - return rootCommand.Parse(args, new CommandLineConfiguration(rootCommand) - { - EnablePosixBundling = false, - }).InvokeAsync(); + return rootCommand.Parse(args, new() { EnablePosixBundling = false }).InvokeAsync(); } } }