Skip to content

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

Merged
ViktorHofer merged 3 commits into
mainfrom
darc-main-9c530a7e-dda1-4981-aa6f-a556a1c3d495
Jul 3, 2026
Merged

[main] Source code updates from dotnet/dotnet#14226
ViktorHofer merged 3 commits into
mainfrom
darc-main-9c530a7e-dda1-4981-aa6f-a556a1c3d495

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Caution

This is an unsafe codeflow update ⚠️ Please review carefully as it may contain undesirable changes and/or reverts.
This PR is a self-corrective attempt most likely caused by a recent change in codeflow subscriptions which results in the currently flown branch main being divergent from the previously flown branch.

It may contain both source code changes from the VMR
as well as dependency updates. Learn more here.

If the changes in this PR look wrong, you also have the option to reset the VMR's contents to match the repository:

darc vmr reset --build 320973 msbuild

This pull request brings the following source code changes

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

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:bcaa8d44d57494224d443dba7c1dfed381ad5528..https://github.com/dotnet/msbuild:darc-main-9c530a7e-dda1-4981-aa6f-a556a1c3d495

@dotnet-maestro
dotnet-maestro Bot temporarily deployed to copilot-pat-pool July 1, 2026 02:09 Inactive
@dotnet-maestro

dotnet-maestro Bot commented Jul 1, 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 320973 of https://github.com/dotnet/dotnet/tree/a9679a8de87742e170318ea39f7f0e2874bcd441.

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/msbuild
cd msbuild

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26329.1 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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 320973 with sources from a9679a8

  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 Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

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

@dotnet-policy-service

dotnet-policy-service Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Hello @dotnet-maestro[bot], I noticed that you’re changing an .swr file or any file under src/Package/MSBuild.VSSetup.. Please make sure to validate this change by an experimental VS insertion. This is accomplished by pushing to an exp/* branch, which requires write permissions to this repo.

@dotnet-maestro
dotnet-maestro Bot temporarily deployed to copilot-pat-pool July 1, 2026 02:10 Inactive
@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-9c530a7e-dda1-4981-aa6f-a556a1c3d495 branch from b9545b2 to ffd22d2 Compare July 2, 2026 02:05
@dotnet-maestro

dotnet-maestro Bot commented Jul 2, 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 321130 of https://github.com/dotnet/dotnet/tree/8050375aad65a00d4e475163c0b91fe22573b6bf.

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/msbuild
cd msbuild

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26329.1 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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 321130 with sources from 8050375

  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 Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs 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-9c530a7e-dda1-4981-aa6f-a556a1c3d495 branch from ffd22d2 to 7eadba1 Compare July 3, 2026 02:08
@dotnet-maestro

dotnet-maestro Bot commented Jul 3, 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 321265 of https://github.com/dotnet/dotnet/tree/bcaa8d44d57494224d443dba7c1dfed381ad5528.

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/msbuild
cd msbuild

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26329.1 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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 321265 with sources from bcaa8d4

  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 Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

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

@AlesProkop
Resolve codeflow conflicts by keeping current branch changes
6f11cf6 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@AlesProkop
AlesProkop requested a review from a team as a code owner July 3, 2026 10:43
@AlesProkop
Fix mojibake encoding corruption in BinaryLogger_Tests.cs
517cc86 
The file's UTF-8 BOM and em-dashes had been re-saved as CP437->UTF-8
mojibake (BOM EF BB BF -> the literal chars, em-dash -> a 3-char
sequence), causing CS1056 'Unexpected character' at line 1. Restored the
correct UTF-8-with-BOM content.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@ViktorHofer
ViktorHofer enabled auto-merge (squash) July 3, 2026 10:52
@ViktorHofer
ViktorHofer merged commit a6e4524 into main Jul 3, 2026
19 of 20 checks passed
@ViktorHofer
ViktorHofer deleted the darc-main-9c530a7e-dda1-4981-aa6f-a556a1c3d495 branch July 3, 2026 11:55
@dotnet-maestro dotnet-maestro Bot mentioned this pull request Jul 4, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ViktorHofer ViktorHofer ViktorHofer 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

@ViktorHofer @AlesProkop