Skip to content
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

Create merge commit to prevent drift #5327

Merged
merged 204 commits into from
Mar 10, 2025
Merged

Create merge commit to prevent drift #5327

merged 204 commits into from
Mar 10, 2025
+0 −0

Conversation

hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Mar 10, 2025 •
edited
Loading

No description provided.

jander-msft and others added 30 commits December 5, 2024 18:29
@jander-msft
Remove prerelease label from Microsoft.Diagnostics.NETCore.Client (do…
0be2f6a 
…tnet#5088)

This change ensures that newer builds of the
Microsoft.Diagnostics.NETCore.Client package have a higher version than
previously built versions. This change has no effect on released version
as this library already adopts the lack of prerelease label in the
`release/stable` branch; it effectively only changes the non-release
builds to align the versioning scheme to be the same as the release
build (always increasing, no prerelease versions). This is the same
behavior that the other `dotnet-*` tools have in this repository.

Fixes dotnet#5085
@dotnet-maestro
[main] Update dependencies from dotnet/sdk (dotnet#5093)
d1077f5 
[main] Update dependencies from dotnet/sdk
@mikem8361
Fix !maddress does work - issue dotnet#5091 (dotnet#5094)
937d664
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
70084ec 
dotnet#5095)

[main] Update dependencies from dotnet/source-build-reference-packages
@mikem8361
Update linux build images (dotnet#5097)
23e559c
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
4db7a95 
dotnet#5099)

[main] Update dependencies from dotnet/source-build-reference-packages
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5100)
1f4c323 
[main] Update dependencies from dotnet/runtime
@robpaveza
Add JavaScript and WASM symbols conventions (dotnet#5096)
65cf0a0 
These conventions are used by Microsoft Edge to obtain source maps from
Symbol Server. They don't need to be matched precisely but are useful.
@mikem8361
Update to build with net8, remove net6 and start net10 testing (dotne…
13357e7 
…t#5103)
@dotnet-maestro @mikem8361
[main] Update dependencies from dotnet/arcade (dotnet#5092)
bda5e2a 
This pull request updates the following dependencies

[marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f
- **Build**: 20241206.6
- **Date Produced**: December 6, 2024 10:46:21 PM UTC
- **Commit**: 61b8f746424762d2e3173ebfaab19346224d591c
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
10.0.0-beta.24578.2 to 10.0.0-beta.24606.6][1]
- **Microsoft.DotNet.Arcade.Sdk**: [from 10.0.0-beta.24578.2 to
10.0.0-beta.24606.6][1]
- **Microsoft.DotNet.CodeAnalysis**: [from 10.0.0-beta.24578.2 to
10.0.0-beta.24606.6][1]

[1]: dotnet/arcade@e8de341...61b8f74

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 10.0.100-alpha.1.24573.1

[marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <[email protected]>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5104)
54961a7 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5105)
9224312 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5106)
8b784e9 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/arcade (dotnet#5109)
bf033be 
[main] Update dependencies from dotnet/arcade
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5108)
0fcf1ea 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/sdk (dotnet#5110)
23f8500 
[main] Update dependencies from dotnet/sdk
@hoyosjs
Update sdk name in Versions.props (dotnet#5112)
bbb125d
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5114)
0787c1c 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5115)
2658efe 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
d4d2071 
dotnet#5113)

This pull request updates the following dependencies

[marker]: <> (Begin:8fefa124-13dd-4c66-7dae-08d9c02d7834)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 8fefa124-13dd-4c66-7dae-08d9c02d7834
- **Build**: 20241216.2
- **Date Produced**: December 16, 2024 10:43:19 PM UTC
- **Commit**: b24c3aa9f120f83befa255d5d5f465b961f387fb
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
-
**Microsoft.SourceBuild.Intermediate.source-build-reference-packages**:
[from 10.0.561001 to 10.0.561602][1]

[1]:
dotnet/source-build-reference-packages@94798e0...b24c3aa

[DependencyUpdate]: <> (End)


[marker]: <> (End:8fefa124-13dd-4c66-7dae-08d9c02d7834)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5117)
1ab2a0e 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5119)
0d9cb0b 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5118)
1cbd0e2 
This pull request updates the following dependencies

[marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f)
## From https://github.com/dotnet/runtime
- **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f
- **Build**: 20241217.3
- **Date Produced**: December 17, 2024 6:40:45 PM UTC
- **Commit**: 040cbe276907174316e2cc07b35814b3069874a6
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.NETCore.App.Runtime.win-x64**: [from
10.0.0-alpha.1.24617.1 to 10.0.0-alpha.1.24617.3][1]
- **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from
10.0.0-alpha.1.24617.1 to 10.0.0-alpha.1.24617.3][1]

[1]: dotnet/runtime@9482c1e...040cbe2

[DependencyUpdate]: <> (End)


[marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5122)
2fb33db 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5123)
845cba7 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5128)
0c3ef8f 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
af2523d 
dotnet#5126)

[main] Update dependencies from dotnet/source-build-reference-packages
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5127)
9c75aa2 
This pull request updates the following dependencies

[marker]: <> (Begin:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb)
## From https://github.com/dotnet/aspnetcore
- **Subscription**: e96c3e1a-afbc-49f7-37c9-08dc4e3803cb
- **Build**: 20241220.2
- **Date Produced**: December 20, 2024 5:35:48 PM UTC
- **Commit**: 794124fda4e2de1db0e6893dc0cc031a181ce52a
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.AspNetCore.App.Ref**: [from 10.0.0-alpha.2.24619.3 to
10.0.0-alpha.2.24620.2][1]
- **Microsoft.AspNetCore.App.Ref.Internal**: [from
10.0.0-alpha.2.24619.3 to 10.0.0-alpha.2.24620.2][1]

[1]:
dotnet/aspnetcore@1d71af1...794124f

[DependencyUpdate]: <> (End)


[marker]: <> (End:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/arcade (dotnet#5130)
9466e55 
[main] Update dependencies from dotnet/arcade
@dotnet-maestro
[main] Update dependencies from dotnet/sdk (dotnet#5131)
1675dd2 
[main] Update dependencies from dotnet/sdk
dotnet-maestro bot and others added 25 commits March 1, 2025 20:38
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
32ac00a 
dotnet#5299)

This pull request updates the following dependencies

[marker]: <> (Begin:8fefa124-13dd-4c66-7dae-08d9c02d7834)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 8fefa124-13dd-4c66-7dae-08d9c02d7834
- **Build**:
[20250228.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2653065)
- **Date Produced**: March 1, 2025 1:18:13 AM UTC
- **Commit**:
[9c8e3885e783e984a48ed3585ff51d86b020d7ce](dotnet/source-build-reference-packages@9c8e388)
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
-
**Microsoft.SourceBuild.Intermediate.source-build-reference-packages**:
[from 10.0.612702 to 10.0.612804][1]

[1]:
dotnet/source-build-reference-packages@01a36c1...9c8e388

[DependencyUpdate]: <> (End)


[marker]: <> (End:8fefa124-13dd-4c66-7dae-08d9c02d7834)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5300)
85c78ad 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5301)
be59f2d 
This pull request updates the following dependencies

[marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f)
## From https://github.com/dotnet/runtime
- **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f
- **Build**:
[20250228.8](https://dev.azure.com/dnceng/internal/_build/results?buildId=2653077)
- **Date Produced**: March 1, 2025 3:51:06 AM UTC
- **Commit**:
[04538da4fc4dca4a5f1184708fe95a16dd947d17](dotnet/runtime@04538da)
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.NETCore.App.Runtime.win-x64**: [from
10.0.0-preview.3.25126.4 to 10.0.0-preview.3.25128.8][1]
- **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from
10.0.0-preview.3.25126.4 to 10.0.0-preview.3.25128.8][1]

[1]: dotnet/runtime@d8a7c7b...04538da

[DependencyUpdate]: <> (End)


[marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5302)
49e48db 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5303)
cb71bee 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/sdk (dotnet#5304)
aac513d 
[main] Update dependencies from dotnet/sdk
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5305)
d71c973 
[main] Update dependencies from dotnet/runtime
Merge remote-tracking branch 'internal'
68e033c
@hoyosjs
Merge main branches (dotnet#5306)
0be9305
@StephaneDelcroix
Launch dsrouter from dotnet-trace (dotnet#5241)
a29f26d 
This PR aim to simplify the process of collecting traces for maui mobile
scenarios and reduce the number of steps for simple cases (when a
dsrouter isn't already running).

It adds a --dsrouter option to collect that takes one of the following
values: android, android-emu, ios, ios-sim

This doesn't make dotnet-trace depends on dotnet-dsrouter, the option
checks for the existence of dsrotuer in the same path as trace, and
invokes it.
@dotnet-maestro
[main] Update dependencies from dotnet/arcade (dotnet#5282)
9297674 
This pull request updates the following dependencies

[marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f
- **Build**:
[20250226.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2651417)
- **Date Produced**: February 26, 2025 9:44:14 PM UTC
- **Commit**:
[6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d](dotnet/arcade@6d4b01b)
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
10.0.0-beta.25113.2 to 10.0.0-beta.25126.4][3]
- **Microsoft.DotNet.Arcade.Sdk**: [from 10.0.0-beta.25113.2 to
10.0.0-beta.25126.4][3]
- **Microsoft.DotNet.CodeAnalysis**: [from 10.0.0-beta.25113.2 to
10.0.0-beta.25126.4][3]

[3]: dotnet/arcade@ea0a0a2...6d4b01b

[DependencyUpdate]: <> (End)


[marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <[email protected]>
@dotnet-maestro
[main] Update dependencies from dotnet/runtime (dotnet#5310)
eb5c55c 
[main] Update dependencies from dotnet/runtime
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5309)
5a2e7eb 
[main] Update dependencies from dotnet/aspnetcore
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
1b1ef2e 
dotnet#5308)

[main] Update dependencies from dotnet/source-build-reference-packages
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5313)
a3e44ab 
[main] Update dependencies from dotnet/aspnetcore
@hoyosjs @mikem8361
Merge release changes into main (dotnet#5275)
b1037b7 
- **Merged PR 47050: Use WIF connection for release management**
- **Fix runtime lifetime issues on error path in SOS**
- **Merged PR 47053: Add auth call to release**
- **Merged PR 47050: Use WIF connection for release management Code
cleanup and configuration update. This pull request updates the release
management process to use WIF (Workload Identity Federation) connection.
- Modified `prepare-release.yml` to remove SAS token generation steps
and update Azure subscription. - Updated `AcquireBuild.ps1` to remove
SAS suffixes parameter and use Azure credentials for blob access.**

---------

Co-authored-by: Mike McLaughlin <[email protected]>
@dotnet-maestro
[main] Update dependencies from dotnet/source-build-reference-packages (
c451a4e 
dotnet#5315)

[main] Update dependencies from dotnet/source-build-reference-packages
@dotnet-maestro
[main] Update dependencies from dotnet/aspnetcore (dotnet#5316)
df2a958 
[main] Update dependencies from dotnet/aspnetcore
@hoyosjs
Remove counter_list support from dotnet-counters (dotnet#5318)
8601422 
We've had --counters for a while, and handling two argument lists (one
for counter_list,
and the other one for the launch params) is pretty gnarly with the new
version of system.commandline
as
dotnet/command-line-api@4b60585
dropped the
flag that enabled this parsing mode.

Since dotnet#1770 we've said that the option was hidden, and
we'd eventually deprecate it.
This commit removes the counter_list argument from dotnet-counters and
we assume that all arguments are
for the launch params.

Fixes dotnet#5317
@hoyosjs
Merge branch main into release/stable
d16cfe0
@zachcmadsen @hoyosjs
Add a diagnostic port option to dotnet-dump (dotnet#5307)
9b3e346 
Partially fixes dotnet#5250

---------

Co-authored-by: Juan Hoyos <[email protected]>
@xoofx
Make DiagnosticsClient.ApplyStartupHook public (dotnet#5086)
d630bc8 
The PR dotnet#3918 introduced `ApplyStartupHook`. This PR is making the API
public.

It seems that the only client of this API today is dotnet-monitor
[here](https://github.com/dotnet/dotnet-monitor/blob/ef3b48791edc90be54297155ccfb092aed71581b/src/Tools/dotnet-monitor/StartupHook/StartupHookApplicator.cs#L73-L85)

This API is particularly useful for loading assemblies in the target
process that could add additional capabilities in what is being traced.

cc: @jander-msft
@hoyosjs
Merge branch 'main' into release/stable
ec1ff35
@hoyosjs
fix merge issues
d2ded83
Merge remote-tracking branch 'origin/release/stable' into release/stable
8aae686
@hoyosjs hoyosjs enabled auto-merge March 10, 2025 17:00
@hoyosjs hoyosjs requested a review from mikem8361 March 10, 2025 17:00
@hoyosjs hoyosjs merged commit 3716113 into dotnet:release/stable Mar 10, 2025
2 checks passed
@hoyosjs hoyosjs deleted the release/stable branch March 10, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikem8361 mikem8361 mikem8361 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.