Skip to content

[main] Source code updates from dotnet/dotnet - #15355

Merged
ViktorHofer merged 5 commits into
mainfrom
darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c
Nov 4, 2026
Merged

[main] Source code updates from dotnet/dotnet#15355
ViktorHofer merged 5 commits into
mainfrom
darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Oct 22, 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 release/11.0.2xx being divergent from the previously flown main.

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 335769 msbuild

This pull request brings the following source code changes

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

New Dependencies

  • Added 4.12.0-3.24574.8
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.CodeAnalysis.CSharp.Workspaces

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:36be6c1093f234dc1757e4a445c257b80b451e0c..https://github.com/dotnet/msbuild:darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c

@dotnet-maestro

dotnet-maestro Bot commented Oct 22, 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 335769 of https://github.com/dotnet/dotnet/tree/d147fa546aa7568a8e3f5e34be71388948ce415d.

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.26521.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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 335769 with sources from d147fa5

  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 Oct 22, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

@dotnet-policy-service

dotnet-policy-service Bot commented Oct 22, 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 force-pushed the darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c branch from 0e51c0b to c2d014b Compare October 29, 2026 02:08
@dotnet-maestro

dotnet-maestro Bot commented Oct 29, 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 338815 of https://github.com/dotnet/dotnet/tree/550c49d825aaeb1dcae23038d45e93df7db9da1a.

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.26521.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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 338815 with sources from 550c49d

  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 Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c branch from c2d014b to 571d732 Compare October 30, 2026 02:08
@dotnet-maestro

dotnet-maestro Bot commented Oct 30, 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 338948 of https://github.com/dotnet/dotnet/tree/1b216daefee8ecc5091e7087eb8c0ab16640a208.

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.26521.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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 338948 with sources from 1b216da

  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 Oct 30, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c branch from 571d732 to cc8a733 Compare November 1, 2026 02:06
@dotnet-maestro

dotnet-maestro Bot commented Nov 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 339203 of https://github.com/dotnet/dotnet/tree/20c4441486b40d61844d8b95ac3619f6299332f4.

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.26521.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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 339203 with sources from 20c4441

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

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c branch from cc8a733 to f5e37cd Compare November 3, 2026 02:06
@dotnet-maestro

dotnet-maestro Bot commented Nov 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 339485 of https://github.com/dotnet/dotnet/tree/7f9b61be8ca37f9dcdbc7fd03a32f19d5344e0a3.

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.26521.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 91fa59f1-1864-46b1-b482-87955691317c --unsafe

    This should apply the build 339485 with sources from 7f9b61b

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

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

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

dotnet-maestro Bot and others added 2 commits November 3, 2026 13:14
@dotnet-maestro @OvesN
Backflow from https://github.com/dotnet/dotnet / 7f9b61b build 339485
52f8a5d 
Diff: https://github.com/dotnet/dotnet/compare/1ec061ee82223a1fff7f84bd78726d18914ebf87..7f9b61be8ca37f9dcdbc7fd03a32f19d5344e0a3

From: dotnet/dotnet@1ec061e
To: dotnet/dotnet@7f9b61b

[[ commit created by automation ]]
@OvesN
Merge VMR build 339485 while preserving newer MSBuild main changes
4ddf776 
Resolve the unsafe release/11.0.2xx backflow without reverting main's
18.14 branding, change wave, OptProf settings, or temp-file guidance.

Retain the TaskAnalyzer source-build fixes from dotnet/dotnet#9184 as
adapted for release/11.0.2xx in dotnet/dotnet#9867, including Roslyn
dependency tracking, source-built overrides, solution inclusion, and
the transitive-pinning opt-out.

Keep the existing analyzer regression tests on main instead of
reintroducing duplicate copies from dotnet/dotnet#9157.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 42e15b55-755d-4c11-8413-c4bf270a9425
@OvesN
OvesN requested a review from a team as a code owner November 3, 2026 12:57
@OvesN

OvesN commented Nov 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Resolved the unsafe backflow in merge commit 4ddf77628, applying VMR build 339485 (7f9b61be8ca3).

VMR fixes retained

Conflict-resolution choices

Preserved main's 18.14 branding and API-compat baseline, Wave 18.14, current OptProf baseline and release documentation, and newer TaskAnalyzer diagnostic guidance. The incoming older snapshot was not allowed to downgrade or remove these changes.

The final change is limited to six dependency/source-build metadata and project files. The source marker now records VMR build 339485, rather than the old build 329383.

@ViktorHofer

ViktorHofer commented Nov 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

@JanProvaznik was the change to backflow from VMR 11.0.2xx instead of main intentional? I assume this changed recently as part of the release activities?

@JanProvaznik

JanProvaznik commented Nov 3, 2026

Copy link
Copy Markdown
Member

yes this is intentional, it changed when VMR main became NET 12, so a month ago

@dotnet-maestro

dotnet-maestro Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

Note

Other PRs in the commit range

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

@ViktorHofer
ViktorHofer merged commit e430918 into main Nov 4, 2026
18 checks passed
@ViktorHofer
ViktorHofer deleted the darc-main-2c1f1e8b-2888-4f7c-8d89-ad59a07b636c branch November 4, 2026 07:49
@dotnet-maestro dotnet-maestro Bot mentioned this pull request Nov 5, 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.

3 participants

@OvesN @ViktorHofer @JanProvaznik