Skip to content

[main] Source code updates from dotnet/dotnet #9163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 15, 2025
+9 −19
Merged

[main] Source code updates from dotnet/dotnet #9163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e96c9
[VMR] Codeflow 86117ef-be6b7b2
dotnet-maestro[bot] Jul 13, 2025
452354e
Update dependencies from https://github.com/dotnet/dotnet build 275021
dotnet-maestro[bot] Jul 13, 2025
97d8600
Update dependencies from https://github.com/dotnet/dotnet build 275039
dotnet-maestro[bot] Jul 14, 2025
d3807f9
Ajust following the change to dotnet/command-line-api
GangWang01 Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -683,4 +681,4 @@ dotnet_analyzer_diagnostic.severity = none
insert_final_newline = false

[test/**/{Approvals,Snapshots}/**]
trim_trailing_whitespace = false
trim_trailing_whitespace = false
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="86117ef4343bab700dab871c416e55b22848cd52" BarId="274788" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="0b032b9f942c1ae8de535a434c4f4a9206fd3339" BarId="275039" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25360.101">
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25363.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25363.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PropertyGroup>
<!-- Non-maestro versions -->
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
<SystemCommandLinePackageVersion>2.0.0-beta6.25360.101</SystemCommandLinePackageVersion>
<SystemCommandLinePackageVersion>2.0.0-beta7.25363.101</SystemCommandLinePackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.25363.101"
}
}
10 changes: 1 addition & 9 deletions tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,7 @@ internal static Task<int> 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)
{
EnablePosixBundling = false
};
return rootCommand.Parse(args, new() { EnablePosixBundling = false }).InvokeAsync();
}
}
}