Skip to content

[main] Source code updates from dotnet/diagnostics - #5229

Closed
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b
Closed

[main] Source code updates from dotnet/diagnostics#5229
dotnet-maestro[bot] wants to merge 1 commit into
mainfrom
darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Mar 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Note

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

This pull request brings the following source code changes

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

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/diagnostics:f361baa46fc86d20f065ed4a314f7a5772267158..https://github.com/dotnet/dotnet:darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b

@dotnet-maestro

dotnet-maestro Bot commented Mar 4, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 304113 of https://github.com/dotnet/diagnostics/tree/b51d0c192667533233cf0a7027931c3643898c64.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26152.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 304113 with sources from b51d0c1
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 4, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from f23553d to a4d9dac Compare March 7, 2026 02:07
@dotnet-maestro

dotnet-maestro Bot commented Mar 7, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 304797 of https://github.com/dotnet/diagnostics/tree/86150ac0275658c5efc6035269499a86dee68e54.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26154.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 304797 with sources from 86150ac
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 7, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from a4d9dac to f5bf86c Compare March 9, 2026 02:03
@dotnet-maestro

dotnet-maestro Bot commented Mar 9, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 305101 of https://github.com/dotnet/diagnostics/tree/18cf9d154ed98f467ad9811e3786a53417debd3b.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26154.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 305101 with sources from 18cf9d1
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 9, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from f5bf86c to a7cddc4 Compare March 11, 2026 02:06
@dotnet-maestro

dotnet-maestro Bot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 305568 of https://github.com/dotnet/diagnostics/tree/1f02e6f622c1ebca7b672a8e8a5a209d19b026ac.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26159.3 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 305568 with sources from 1f02e6f
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@lewing lewing mentioned this pull request Mar 11, 2026
Closed
@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from a7cddc4 to 04679a6 Compare March 12, 2026 02:07
@dotnet-maestro

dotnet-maestro Bot commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 305819 of https://github.com/dotnet/diagnostics/tree/1886eb85161ee676f64ff397b3fb0cbf5634698d.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26161.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 305819 with sources from 1886eb8
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from 04679a6 to 97b9850 Compare March 19, 2026 02:07
@dotnet-maestro

dotnet-maestro Bot commented Mar 19, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 306683 of https://github.com/dotnet/diagnostics/tree/bc1b058b0d1cff4256b1ba5dbfee9f1764f72096.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26167.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 306683 with sources from bc1b058
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 19, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch from 97b9850 to 30e8bcf Compare March 23, 2026 02:04
@dotnet-maestro

dotnet-maestro Bot commented Mar 23, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 307257 of https://github.com/dotnet/diagnostics/tree/f361baa46fc86d20f065ed4a314f7a5772267158.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26167.2 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription fffd23ac-cce6-400c-919a-5fed1f9cb1f5
    This should apply the build 307257 with sources from f361baa
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 23, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

This was referenced Apr 21, 2026
Closed
Open
@hoyosjs hoyosjs closed this Apr 28, 2026
@hoyosjs
hoyosjs deleted the darc-main-6ed41be3-712a-4eb5-80da-9e789a34ff4b branch April 28, 2026 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@hoyosjs