Skip to content

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

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

Jump to bottom
Merged
merged 24 commits into from
Jul 17, 2025
Merged

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

merged 24 commits into from
Jul 17, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 20, 2025 •
edited
Loading

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

Updated Dependencies

Associated changes in source repos

dotnet-maestro bot added 13 commits June 20, 2025 02:06
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 272389
3f48124 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.631904 -> 0.2.631905)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 272596
0191e1e 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.631905 -> 0.2.632106)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 272656
a2fb362 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.632106 -> 0.2.632118)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 272780
d4bd450 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.632118 -> 0.2.632402)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 272949
61de9ed 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.632402 -> 0.2.632503)
@dotnet-maestro
Merging main into darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29
5da13d1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273094
f552531 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.632503 -> 0.2.0-preview.25325.106)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273256
6444851 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25325.106 -> 0.2.0-preview.25326.109)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273347
0cce69d 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25326.109 -> 0.2.0-preview.25327.102)
@dotnet-maestro
Merge main into darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29
037b390
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273672
e780f1f 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25327.102 -> 0.2.0-preview.25330.103)
@dotnet-maestro
Merge main into darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29
8d0b765
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273813
296c8f8 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25330.103 -> 0.2.0-preview.25351.105)
@nohwnd
Copy link
Member

nohwnd commented Jul 2, 2025

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

dotnet-maestro bot added 8 commits July 3, 2025 02:06
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 273855
2ee9b72 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25351.105 -> 0.2.0-preview.25351.106)
@dotnet-maestro
Merge main into darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29
b711ec7
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 274386
34291f4 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25351.106 -> 0.2.0-preview.25358.102)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 274568
f5f5be8 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25358.102 -> 0.2.0-preview.25359.101)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 274788
a2af597 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25359.101 -> 0.2.0-preview.25360.101)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275021
ca46cb2 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25360.101 -> 0.2.0-preview.25362.103)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275039
bfe3472 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25362.103 -> 0.2.0-preview.25363.101)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275143
1ba9c49 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25363.101 -> 0.2.0-preview.25364.102)
@nohwnd
Copy link
Member

nohwnd commented Jul 15, 2025

update from dotnet/dotnet updated us to the 0.2.xxx version, and now it is trying to downgrade, did the versioning change and this is now safe to merge @ViktorHofer ?

c049523

@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275313
7d00e7f 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25364.102 -> 0.2.0-preview.25365.101)
@akoeplinger
Copy link
Member

This was introduced in dotnet/dotnet#1317. I wonder if you should be consuming the package from the dotnet/diagnostics build instead of the VMR build cause it seems you're redistributing it. @mmitche

dotnet-maestro bot added 2 commits July 17, 2025 02:14
@dotnet-maestro
Merge main into darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29
4d64dbb
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275513
b3d5107 
Updated Dependencies:
Microsoft.Diagnostics.NETCore.Client (Version 0.2.0-preview.25365.101 -> 0.2.0-preview.25366.103)
@akoeplinger
Copy link
Member

Dug through some more Teams history and this should be fine precisely because you're only redistributing it inside another package (not as a transitive reference) so the version number doesn't really matter, it's basically just a transport package.

nohwnd
nohwnd approved these changes Jul 17, 2025
View reviewed changes
Copy link
Member

@nohwnd nohwnd left a comment

Choose a reason for hiding this comment

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

okay to downgrade, per comments above.

@nohwnd nohwnd merged commit c144443 into main Jul 17, 2025
11 of 12 checks passed
@nohwnd nohwnd deleted the darc-main-82558c1b-48b7-453a-88c0-cda8fc1e9b29 branch July 17, 2025 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akoeplinger akoeplinger akoeplinger approved these changes

@nohwnd nohwnd nohwnd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nohwnd @akoeplinger