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.

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

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 9, 2025

Note

This is a codeflow update. It may contain both source code changes from the VMR as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

New Dependencies

Updated Dependencies

Associated changes in source repos

dotnet-maestro bot added 2 commits July 9, 2025 02:09
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25351.106 -> 10.0.0-beta.25358.102)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25351.106 -> 10.0.100-preview.7.25358.102)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25351.106 -> 10.0.0-preview.7.25358.102)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25351.106 -> 5.0.0-1.25358.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25351.106 -> 10.0.0-preview.25358.102)
@ViktorHofer
Copy link
Member

System.IO.FileNotFoundException : Native debugger (DotNetDump) path not set or does not exist: D:\a_work\1\s\artifacts\bin\dotnet-dump\Release\net8.0\publish\dotnet-dump.dll

cc @hoyosjs

@ViktorHofer
Copy link
Member

D:\a_work\1\s.dotnet\sdk\10.0.100-preview.7.25322.101\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.ConflictResolution.targets(112,5): error NETSDK1152: Found multiple publish output files with the same relative path: D:\a_work\1\s\artifacts\bin\dotnet-dump\Release\shims\net8.0\win-x64\dotnet-dump.exe, D:\a_work\1\s\artifacts\bin\dotnet-dump\Release/shims/net8.0\win-x64\dotnet-dump.exe, D:\a_work\1\s\artifacts\bin\dotnet-dump\Release\shims\net8.0\win-x86\dotnet-dump.exe, D:\a_work\1\s\artifacts\bin\dotnet-dump\Release/shims/net8.0\win-x86\dotnet-dump.exe, D:\a_work\1\s\artifacts\bin\dotnet-dump\Release\shims\net8.0\osx-x64\dotnet-dump, D:\a_work\1\s\artifacts\bin\dotnet-dump\Release/shims/net8.0\osx-x64\dotnet-dump. [D:\a_work\1\s\src\Tools\dotnet-dump\dotnet-dump.csproj]

Could the recent SDK changes around RID specific tools be related? cc @dsplaisted @baronfel

@hoyosjs
Copy link
Member

hoyosjs commented Jul 10, 2025

Most likely - we do set rids. I have to check how this changes it.

dotnet-maestro bot added 5 commits July 10, 2025 02:08
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25358.102 -> 10.0.0-beta.25359.101)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25358.102 -> 10.0.100-preview.7.25359.101)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25358.102 -> 10.0.0-preview.7.25359.101)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25358.102 -> 5.0.0-1.25359.101)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25358.102 -> 10.0.0-preview.25359.101)
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25359.101 -> 10.0.0-beta.25360.101)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25359.101 -> 10.0.100-preview.7.25360.101)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25359.101 -> 10.0.0-preview.7.25360.101)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25359.101 -> 5.0.0-1.25360.101)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25359.101 -> 10.0.0-preview.25360.101)
[[ commit created by automation ]]
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25360.101 -> 10.0.0-beta.25362.103)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25360.101 -> 10.0.100-preview.7.25362.103)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25360.101 -> 10.0.0-preview.7.25362.103)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25360.101 -> 5.0.0-1.25362.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25360.101 -> 10.0.0-preview.25362.103)
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner July 13, 2025 02:04
dotnet-maestro bot added 4 commits July 14, 2025 02:05
[[ commit created by automation ]]
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25362.103 -> 10.0.0-beta.25363.101)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25362.103 -> 10.0.100-preview.7.25363.101)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25362.103 -> 10.0.0-preview.7.25363.101)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25362.103 -> 5.0.0-1.25363.101)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25362.103 -> 10.0.0-preview.25363.101)
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25363.101 -> 10.0.0-beta.25364.102)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25363.101 -> 10.0.100-preview.7.25364.102)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25363.101 -> 10.0.0-preview.7.25364.102)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25363.101 -> 5.0.0-1.25364.102)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25363.101 -> 10.0.0-preview.25364.102)
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25364.102 -> 10.0.0-beta.25365.101)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25364.102 -> 10.0.100-preview.7.25365.101)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25364.102 -> 10.0.0-preview.7.25365.101)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25364.102 -> 5.0.0-1.25365.101)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25364.102 -> 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

… and react to changes in the library

Co-authored-by: Adam Sitnik <[email protected]>
@hoyosjs
Copy link
Member

hoyosjs commented Jul 16, 2025

The duplicates are the shims:

artifacts\bin\dotnet-dump\Debug/shims/net8.0\win-x64\dotnet-dump.exe
artifacts\bin\dotnet-dump\Debug\shims\net8.0\win-x64\dotnet-dump.exe

The one coming from ComputeEmbeddedApphostPaths-> GetEmbeddedApphostPaths not normalizing PackagedShimOutputDirectory (this path was always hit). And another from _ComputeExpectedEmbeddedApphostPaths.

This was the normalization that made one path correct but not the other:

dotnet/sdk@578eba8

Wonder if normalizing ComputeEmbeddedApphostPaths would be enough.

@hoyosjs
Copy link
Member

hoyosjs commented Jul 16, 2025

That worked for dotnet-dump so I opened dotnet/sdk#49801

@akoeplinger
Copy link
Member

sdk flow is currently blocked on dotnet/dotnet#1475

dotnet-maestro bot added 3 commits July 17, 2025 02:11
[[ commit created by automation ]]
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25365.101 -> 10.0.0-beta.25366.103)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25365.101 -> 10.0.100-preview.7.25366.103)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25365.101 -> 10.0.0-preview.7.25366.103)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25365.101 -> 5.0.0-1.25366.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25365.101 -> 10.0.0-preview.25366.103)
@hoyosjs
Copy link
Member

hoyosjs commented Jul 17, 2025

I'll revert System.Commandline changes - we've decided to pin the dependency

@akoeplinger
Copy link
Member

@hoyosjs I don't think that will work given source-build will be using the live version

@hoyosjs
Copy link
Member

hoyosjs commented Jul 17, 2025

@akoeplinger - we don't ship out of VMR/sourcebuild. There's exactly 1 thing that is considered as a supported asset from diagnostics for the VMR: Microsoft.Diagnostics.NETCore.Client. To avoid this break of expectations we should just disable building all else. Right now, we can't take this as is. Our shipping cycles look different, and this would block a shipping vehicle potentially while waiting for a new API in commandline.

dotnet-maestro bot and others added 3 commits July 18, 2025 02:07
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25366.103 -> 10.0.0-beta.25367.101)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25366.103 -> 10.0.100-preview.7.25367.101)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25366.103 -> 10.0.0-preview.7.25367.101)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25366.103 -> 5.0.0-2.25367.101)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25366.103 -> 10.0.0-preview.25367.101)
Updated Dependencies:
runtime.win-x64.Microsoft.DotNet.Cdac.Transport, runtime.win-arm64.Microsoft.DotNet.Cdac.Transport, runtime.linux-x64.Microsoft.DotNet.Cdac.Transport, runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport, runtime.osx-x64.Microsoft.DotNet.Cdac.Transport, runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport (Version 10.0.0-preview.7.25351.106 -> 10.0.0-preview.7.25367.104)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25367.101 -> 10.0.0-beta.25367.104)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25367.101 -> 10.0.100-preview.7.25367.104)
Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.App.Ref, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms (Version 10.0.0-preview.7.25367.101 -> 10.0.0-preview.7.25367.104)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-2.25367.101 -> 5.0.0-2.25367.104)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25367.101 -> 10.0.0-preview.25367.104)
dotnet-maestro bot added 2 commits July 26, 2025 02:06
Updated Dependencies:
runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport, runtime.linux-x64.Microsoft.DotNet.Cdac.Transport, runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport, runtime.osx-x64.Microsoft.DotNet.Cdac.Transport, runtime.win-arm64.Microsoft.DotNet.Cdac.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, runtime.win-x64.Microsoft.DotNet.Cdac.Transport (Version 10.0.0-preview.7.25374.102 -> 10.0.0-preview.7.25375.106)
Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal (Version 10.0.0-rc.1.25374.102 -> 10.0.0-rc.1.25375.106)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp (Version 5.0.0-2.25374.102 -> 5.0.0-2.25375.106)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25374.102 -> 10.0.0-preview.25375.106)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25374.102 -> 10.0.0-beta.25375.106)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25374.102 -> 10.0.100-preview.7.25375.106)
@dotnet-maestro dotnet-maestro bot dismissed stale reviews from hoyosjs and akoeplinger via 8c8904d July 26, 2025 02:06
hoyosjs and others added 11 commits July 25, 2025 20:50
This reverts commit 0321073.
Updated Dependencies:
runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport, runtime.linux-x64.Microsoft.DotNet.Cdac.Transport, runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport, runtime.osx-x64.Microsoft.DotNet.Cdac.Transport, runtime.win-arm64.Microsoft.DotNet.Cdac.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, runtime.win-x64.Microsoft.DotNet.Cdac.Transport (Version 10.0.0-preview.7.25375.106 -> 10.0.0-preview.7.25375.119)
Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal (Version 10.0.0-rc.1.25375.106 -> 10.0.0-rc.1.25375.119)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp (Version 5.0.0-2.25375.106 -> 5.0.0-2.25375.119)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.106 -> 10.0.0-preview.25375.119)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25375.106 -> 10.0.0-beta.25375.119)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25375.106 -> 10.0.100-preview.7.25375.119)
[[ commit created by automation ]]
Updated Dependencies:
runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport, runtime.linux-x64.Microsoft.DotNet.Cdac.Transport, runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport, runtime.osx-x64.Microsoft.DotNet.Cdac.Transport, runtime.win-arm64.Microsoft.DotNet.Cdac.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, runtime.win-x64.Microsoft.DotNet.Cdac.Transport (Version 10.0.0-preview.7.25375.119 -> 10.0.0-preview.7.25377.103)
Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal (Version 10.0.0-rc.1.25375.119 -> 10.0.0-rc.1.25377.103)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp (Version 5.0.0-2.25375.119 -> 5.0.0-2.25377.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.119 -> 10.0.0-preview.25377.103)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25375.119 -> 10.0.0-beta.25377.103)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25375.119 -> 10.0.100-preview.7.25377.103)
Updated Dependencies:
runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport, runtime.linux-x64.Microsoft.DotNet.Cdac.Transport, runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport, runtime.osx-x64.Microsoft.DotNet.Cdac.Transport, runtime.win-arm64.Microsoft.DotNet.Cdac.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, runtime.win-x64.Microsoft.DotNet.Cdac.Transport (Version 10.0.0-preview.7.25377.103 -> 10.0.0-rc.1.25401.103)
Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal (Version 10.0.0-rc.1.25377.103 -> 10.0.0-rc.1.25401.103)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp (Version 5.0.0-2.25377.103 -> 5.0.0-2.25401.103)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25377.103 -> 10.0.0-preview.25401.103)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis (Version 10.0.0-beta.25377.103 -> 10.0.0-beta.25401.103)
Microsoft.NET.Sdk (Version 10.0.100-preview.7.25377.103 -> 10.0.100-rc.1.25401.103)
Microsoft.Diagnostics.Runtime, Microsoft.Diagnostics.Runtime.Utilities (Version 4.0.0-beta.25381.2 -> 4.0.0-beta.25381.2)
This reverts commit 0321073.
@akoeplinger
Copy link
Member

I disabled the subscription for now so we don't need to constantly do the revert.

This still fails due to the test failure on Windows x86. I think we should disable the test to unblock the PR.

@ViktorHofer
Copy link
Member

Gentle ping @hoyosjs. We want to get this one in before the snap on Friday.

akoeplinger and others added 2 commits August 12, 2025 00:11
Otherwise this will point to the path in the executing host sdk which causes issues when running x86 tests.
ViktorHofer
ViktorHofer previously approved these changes Aug 12, 2025
@hoyosjs hoyosjs disabled auto-merge August 12, 2025 22:15
@hoyosjs hoyosjs enabled auto-merge (squash) August 12, 2025 22:15
@hoyosjs hoyosjs merged commit fde62e1 into main Aug 12, 2025
25 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-4ec815c3-5eaf-4b7c-b324-e4a7bced9258 branch August 12, 2025 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants