Skip to content

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

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 54 commits into from
Aug 12, 2025
Merged

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

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
30db6a9
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 9, 2025
c3848b8
Update dependencies from https://github.com/dotnet/dotnet build 274386
dotnet-maestro[bot] Jul 9, 2025
4c5f8d7
Update dependencies from https://github.com/dotnet/dotnet build 274568
dotnet-maestro[bot] Jul 10, 2025
43082c1
Update dependencies from https://github.com/dotnet/dotnet build 274788
dotnet-maestro[bot] Jul 11, 2025
6e55fb0
[VMR] Codeflow 7d70948-7d70948
dotnet-maestro[bot] Jul 13, 2025
815feec
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 13, 2025
a508cd1
Update dependencies from https://github.com/dotnet/dotnet build 275021
dotnet-maestro[bot] Jul 13, 2025
0828e49
[VMR] Codeflow c3c57bb-c3c57bb
dotnet-maestro[bot] Jul 14, 2025
731b991
Update dependencies from https://github.com/dotnet/dotnet build 275039
dotnet-maestro[bot] Jul 14, 2025
490126a
Update dependencies from https://github.com/dotnet/dotnet build 275143
dotnet-maestro[bot] Jul 15, 2025
e01d7f8
Update dependencies from https://github.com/dotnet/dotnet build 275313
dotnet-maestro[bot] Jul 16, 2025
bee6d30
Update System.CommandLine dependency to version 2.0.0-beta7.25365.101…
hoyosjs Jul 16, 2025
8994d77
[VMR] Codeflow 1586391-1586391
dotnet-maestro[bot] Jul 17, 2025
2de29ef
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 17, 2025
1ee9540
Update dependencies from https://github.com/dotnet/dotnet build 275513
dotnet-maestro[bot] Jul 17, 2025
79b7878
Update dependencies from https://github.com/dotnet/dotnet build 275638
dotnet-maestro[bot] Jul 18, 2025
dc41e01
Merge branch 'main' into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
hoyosjs Jul 18, 2025
65ec3c8
Update dependencies from https://github.com/dotnet/dotnet build 275726
dotnet-maestro[bot] Jul 18, 2025
fb9202e
Revert "Update System.CommandLine dependency to version 2.0.0-beta7.2…
akoeplinger Jul 18, 2025
f5879e7
Revert command-line-api changes from VMR
akoeplinger Jul 18, 2025
327a43a
Bump to newer sdk to get msbuild fix
akoeplinger Jul 18, 2025
09a3642
[VMR] Codeflow 4e46ba6-4e46ba6
dotnet-maestro[bot] Jul 19, 2025
5fc8913
Update dependencies from https://github.com/dotnet/dotnet build 275814
dotnet-maestro[bot] Jul 19, 2025
91c9e47
Update dependencies from https://github.com/dotnet/dotnet build 275898
dotnet-maestro[bot] Jul 20, 2025
e5e1567
Revert command-line-api changes from VMR again
hoyosjs Jul 21, 2025
5979243
Bump to newer sdk to get msbuild fix
akoeplinger Jul 22, 2025
39bfade
[VMR] Codeflow 7906474-7906474
dotnet-maestro[bot] Jul 23, 2025
5845fb5
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 23, 2025
be3decb
Update dependencies from https://github.com/dotnet/dotnet build 276277
dotnet-maestro[bot] Jul 23, 2025
3bbaea6
Revert VMR changes and take dotnet p7 update
hoyosjs Jul 24, 2025
433aad7
Update dependencies from https://github.com/dotnet/dotnet build 276450
dotnet-maestro[bot] Jul 24, 2025
4452839
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 25, 2025
c5d5183
Update dependencies from https://github.com/dotnet/dotnet build 276628
dotnet-maestro[bot] Jul 25, 2025
bf86df6
Use p7 dotnet update
akoeplinger Jul 25, 2025
3bcbb87
Clear MSBuildExtensionsPath as well when building/publishing test apps
akoeplinger Jul 25, 2025
0321073
[VMR] Codeflow d7d8500-d7d8500
dotnet-maestro[bot] Jul 26, 2025
ee9aad6
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Jul 26, 2025
8c8904d
Update dependencies from https://github.com/dotnet/dotnet build 276797
dotnet-maestro[bot] Jul 26, 2025
c5c4ca0
Revert VMR changes
hoyosjs Jul 26, 2025
cc55ce8
Update dependencies from https://github.com/dotnet/dotnet build 276828
dotnet-maestro[bot] Jul 27, 2025
50b8dbf
Update global.json
hoyosjs Jul 28, 2025
a0f6193
[VMR] Codeflow 24de8bf-24de8bf
dotnet-maestro[bot] Jul 29, 2025
1605ea5
Update dependencies from https://github.com/dotnet/dotnet build 276981
dotnet-maestro[bot] Jul 29, 2025
91a102e
Backflow from https://github.com/dotnet/dotnet / 8b29a16 build 277635
dotnet-maestro[bot] Aug 1, 2025
fa3779b
Merge main into darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258
dotnet-maestro[bot] Aug 1, 2025
76c9467
Update dependencies from https://github.com/dotnet/dotnet build 277635
dotnet-maestro[bot] Aug 1, 2025
a762b3e
Revert VMR changes
hoyosjs Jul 26, 2025
e7bba47
Fix properties that were moved to Version.Details.props
akoeplinger Aug 3, 2025
74772be
Update Versions.props
akoeplinger Aug 3, 2025
6745ca5
Clear MSBuildExtensionsPath as well when building/publishing test apps
akoeplinger Jul 25, 2025
6312554
Disable test
hoyosjs Aug 12, 2025
8a4f707
Bump to newer sdk
akoeplinger Aug 12, 2025
b3a8fd8
Update dependencies
akoeplinger Aug 12, 2025
7678801
Disable StackAndOtherTests against x86
hoyosjs Aug 12, 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
46 changes: 23 additions & 23 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="eaa19c281d34580a8168cff9ce1e7337da8bfe4f" BarId="273855" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="78061f4bcc414fa2054be6237b1fd3813d8edf6b" BarId="275313" />
<ProductDependencies>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.25359.1">
<Uri>https://github.com/microsoft/clrmd</Uri>
Expand All @@ -11,53 +11,53 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25351.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25351.106">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.7.25351.106">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.7.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-preview.7.25351.106">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-preview.7.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.7.25351.106">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.7.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25351.106">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25351.106">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25351.106">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25351.106">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25351.106">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25351.106">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25365.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer - this changes code from system.commandline but doesn't bump the dep. This is pretty painful for backflows... Essentially we either agree we want to use the VMR version of commandline (which is a business decision and would be good to consult the team), or you leave the version fixed and no code change is needed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bumping also needs #5493

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adamsitnik - I folded the changes for public types here, but there's still seems to be no way to set the help width from the helpaction. Is there a planned API on this? I don't want to regress that scenario.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adamsitnik - I folded the changes for public types here, but there's still seems to be no way to set the help width from the helpaction. Is there a planned API on this? I don't want to regress that scenario.

I've sent dotnet/command-line-api#2635. Once it gets merged you should be able to achieve the same effect with the new API. Apologies for the delay

</Dependency>
</ToolsetDependencies>
</Dependencies>
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<!-- We use platforms for the unstable package version and
the ref pack as the stable version. We need them as download links
use the unstable version, but the installed assets are all stable. -->
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25351.106</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25351.106</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25365.101</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25365.101</MicrosoftNETCoreAppRefVersion>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.7.25351.106</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.7.25351.106</MicrosoftAspNetCoreAppRefVersion>
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.7.25365.101</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.7.25365.101</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<MicrosoftNETSdkVersion>10.0.100-preview.7.25351.106</MicrosoftNETSdkVersion>
<MicrosoftNETSdkVersion>10.0.100-preview.7.25365.101</MicrosoftNETSdkVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Opt-in/out repo features -->
Expand Down Expand Up @@ -58,7 +58,7 @@
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25351.106</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25365.101</MicrosoftDotNetCodeAnalysisVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.556</StyleCopAnalyzersVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
<cdbsosversion>10.0.26100.1</cdbsosversion>
Expand All @@ -71,8 +71,8 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-1.25351.106</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>5.0.0-1.25351.106</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-1.25365.101</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>5.0.0-1.25365.101</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.11.0-2.24271.11</MicrosoftNetCompilersToolsetVersion>
<!-- Compatibility with VS 16.11/.NET SDK 5.0.4xx -->
<MicrosoftCodeAnalysisVersion_3_11>3.11.0</MicrosoftCodeAnalysisVersion_3_11>
Expand All @@ -86,8 +86,8 @@
<MicrosoftCodeAnalysisVersion_4_4>4.4.0</MicrosoftCodeAnalysisVersion_4_4>
<MicrosoftCodeAnalysisVersion_LatestVS>4.8.0</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisAnalyzersVersion>5.0.0-1.25351.106</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25351.106</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>5.0.0-1.25365.101</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25365.101</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!--
These packages affect the design-time experience in VS, so we update them at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
-->
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "10.0.100-preview.6.25315.102",
"version": "10.0.100-preview.7.25322.101",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "10.0.100-preview.6.25315.102",
"dotnet": "10.0.100-preview.7.25322.101",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreApp80Version)"
Expand All @@ -17,6 +17,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.106"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25365.101"
}
}
9 changes: 1 addition & 8 deletions src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,8 @@ public CommandGroup(string commandPrompt = null)
/// <exception cref="DiagnosticsException">parsing error</exception>
internal bool Execute(IReadOnlyList<string> commandLine, IServiceProvider services)
{
IConsoleService consoleService = services.GetService<IConsoleService>();
CommandLineConfiguration configuration = new(_rootCommand)
{
Output = new ConsoleServiceWrapper(consoleService.Write),
Error = new ConsoleServiceWrapper(consoleService.WriteError)
};

// Parse the command line and invoke the command
ParseResult parseResult = configuration.Parse(commandLine);
ParseResult parseResult = _rootCommand.Parse(commandLine);

if (parseResult.Errors.Count > 0)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Tools/dotnet-trace/CommandLine/Commands/CollectCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private static void ConsoleWriteLine(string str)
/// <param name="stoppingEventPayloadFilter">A string, parsed as [payload_field_name]:[payload_field_value] pairs separated by commas, that will stop the trace upon hitting an event with a matching payload. Requires `--stopping-event-provider-name` and `--stopping-event-event-name` to be set.</param>
/// <param name="rundown">Collect rundown events.</param>
/// <returns></returns>
private static async Task<int> Collect(CancellationToken ct, CommandLineConfiguration cliConfig, int processId, FileInfo output, uint buffersize, string providers, string profile, TraceFileFormat format, TimeSpan duration, string clrevents, string clreventlevel, string name, string diagnosticPort, bool showchildio, bool resumeRuntime, string stoppingEventProviderName, string stoppingEventEventName, string stoppingEventPayloadFilter, bool? rundown, string dsrouter)
private static async Task<int> Collect(CancellationToken ct, InvocationConfiguration cliConfig, int processId, FileInfo output, uint buffersize, string providers, string profile, TraceFileFormat format, TimeSpan duration, string clrevents, string clreventlevel, string name, string diagnosticPort, bool showchildio, bool resumeRuntime, string stoppingEventProviderName, string stoppingEventEventName, string stoppingEventPayloadFilter, bool? rundown, string dsrouter)
{
bool collectionStopped = false;
bool cancelOnEnter = true;
Expand Down Expand Up @@ -587,7 +587,7 @@ public static Command CollectCommand()

collectCommand.SetAction((parseResult, ct) => Collect(
ct,
cliConfig: parseResult.Configuration,
cliConfig: parseResult.InvocationConfiguration,
processId: parseResult.GetValue(CommonOptions.ProcessIdOption),
output: parseResult.GetValue(OutputPathOption),
buffersize: parseResult.GetValue(CircularBufferOption),
Expand Down
Loading