Skip to content

[automated] Merge branch 'vs18.7' => 'vs18.8'#13947

Open
github-actions[bot] wants to merge 11 commits into
vs18.8from
merge/vs18.7-to-vs18.8
Open

[automated] Merge branch 'vs18.7' => 'vs18.8'#13947
github-actions[bot] wants to merge 11 commits into
vs18.8from
merge/vs18.7-to-vs18.8

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented Jun 4, 2026

I detected changes in the vs18.7 branch which have not been merged yet to vs18.8. I'm a robot and am configured to help you automatically keep vs18.8 up to date, so I've opened this PR.

This PR merges commits made on vs18.7 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout vs18.7
git pull --ff-only
git checkout vs18.8
git pull --ff-only
git merge --no-ff vs18.7

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs18.7-to-vs18.8
or if you are using SSH
git push git@github.com:dotnet/msbuild HEAD:merge/vs18.7-to-vs18.8

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs18.7-to-vs18.8'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/vs18.7-to-vs18.8 origin/vs18.8
git pull https://github.com/dotnet/msbuild merge/vs18.7-to-vs18.8
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs18.7-to-vs18.8
or if you are using SSH
git fetch
git checkout -b merge/vs18.7-to-vs18.8 origin/vs18.8
git pull git@github.com:dotnet/msbuild merge/vs18.7-to-vs18.8
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs18.7-to-vs18.8

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro Bot and others added 9 commits May 20, 2026 17:29
This pull request updates the following dependencies

[marker]: <> (Begin:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
## From https://github.com/dotnet/arcade
- **Subscription**:
[8b822e25-6fe2-4f64-8b53-1ba32cac78e4](https://maestro.dot.net/subscriptions?search=8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
- **Build**:
[20260507.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2969534)
([313474](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/313474))
- **Date Produced**: May 7, 2026 2:49:53 PM UTC
- **Commit**:
[3454b2fe822e52373f2604856417b0e6bce71d70](dotnet/arcade@3454b2f)
- **Branch**:
[release/10.0](https://github.com/dotnet/arcade/tree/release/10.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [10.0.0-beta.26164.1 to 10.0.0-beta.26257.4][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@e365cfc...3454b2f

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates **tools.dotnet** to 10.0.107

[marker]: <> (End:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nguyen Huu Linh <huulinhnguyen99@gmail.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
This pull request updates the following dependencies

[marker]: <> (Begin:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
## From https://github.com/dotnet/arcade
- **Subscription**:
[8b822e25-6fe2-4f64-8b53-1ba32cac78e4](https://maestro.dot.net/subscriptions?search=8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
- **Build**:
[20260519.10](https://dev.azure.com/dnceng/internal/_build/results?buildId=2978939)
([315004](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/315004))
- **Date Produced**: May 19, 2026 3:48:38 PM UTC
- **Commit**:
[ef50e01056369b217663cac33386645a296ef53d](dotnet/arcade@ef50e01)
- **Branch**:
[release/10.0](https://github.com/dotnet/arcade/tree/release/10.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [10.0.0-beta.26257.4 to 10.0.0-beta.26269.10][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@3454b2f...ef50e01

[DependencyUpdate]: <> (End)


[marker]: <> (End:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang (BEYONDSOFT CONSULTING INC) <v-gaw@microsoft.com>
This pull request updates the following dependencies

[marker]: <> (Begin:0d0c31fc-ed95-4201-b312-fa81f93928bb)
## From https://github.com/dotnet/arcade
- **Subscription**:
[0d0c31fc-ed95-4201-b312-fa81f93928bb](https://maestro.dot.net/subscriptions?search=0d0c31fc-ed95-4201-b312-fa81f93928bb)
- **Build**:
[20260519.10](https://dev.azure.com/dnceng/internal/_build/results?buildId=2978939)
([315004](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/315004))
- **Date Produced**: May 19, 2026 3:48:38 PM UTC
- **Commit**:
[ef50e01056369b217663cac33386645a296ef53d](dotnet/arcade@ef50e01)
- **Branch**:
[release/10.0](https://github.com/dotnet/arcade/tree/release/10.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [10.0.0-beta.26257.4 to 10.0.0-beta.26269.10][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitV3Extensions

[1]: dotnet/arcade@3454b2f...ef50e01

[DependencyUpdate]: <> (End)


[marker]: <> (End:0d0c31fc-ed95-4201-b312-fa81f93928bb)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang (BEYONDSOFT CONSULTING INC) <v-gaw@microsoft.com>
This pull request updates the following dependencies

[marker]: <> (Begin:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
## From https://github.com/dotnet/arcade
- **Subscription**:
[8b822e25-6fe2-4f64-8b53-1ba32cac78e4](https://maestro.dot.net/subscriptions?search=8b822e25-6fe2-4f64-8b53-1ba32cac78e4)
- **Build**:
[20260528.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2986522)
([316237](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/316237))
- **Date Produced**: May 28, 2026 9:11:55 PM UTC
- **Commit**:
[a7bf38d04c8247b059c688f5448dc556e0cd6bb5](dotnet/arcade@a7bf38d)
- **Branch**:
[release/10.0](https://github.com/dotnet/arcade/tree/release/10.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [10.0.0-beta.26269.10 to 10.0.0-beta.26278.2][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@ef50e01...a7bf38d

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates **tools.dotnet** to 10.0.108

[marker]: <> (End:8b822e25-6fe2-4f64-8b53-1ba32cac78e4)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang (BEYONDSOFT CONSULTING INC) <v-gaw@microsoft.com>
This pull request updates the following dependencies

[marker]: <> (Begin:0d0c31fc-ed95-4201-b312-fa81f93928bb)
## From https://github.com/dotnet/arcade
- **Subscription**:
[0d0c31fc-ed95-4201-b312-fa81f93928bb](https://maestro.dot.net/subscriptions?search=0d0c31fc-ed95-4201-b312-fa81f93928bb)
- **Build**:
[20260528.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2986522)
([316237](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/316237))
- **Date Produced**: May 28, 2026 9:11:55 PM UTC
- **Commit**:
[a7bf38d04c8247b059c688f5448dc556e0cd6bb5](dotnet/arcade@a7bf38d)
- **Branch**:
[release/10.0](https://github.com/dotnet/arcade/tree/release/10.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [10.0.0-beta.26269.10 to 10.0.0-beta.26278.2][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitV3Extensions

[1]: dotnet/arcade@ef50e01...a7bf38d

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates **tools.dotnet** to 10.0.108

[marker]: <> (End:0d0c31fc-ed95-4201-b312-fa81f93928bb)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang (BEYONDSOFT CONSULTING INC) <v-gaw@microsoft.com>
…#13923)

vs18.6 stabilization should train OptProf against the VS channel that
ships matching 18.6 bits, not the moving int.main channel. Training
against int.main causes drift and breaks OptProf collection.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
I detected changes in the vs18.6 branch which have not been merged yet
to vs18.7. I'm a robot and am configured to help you automatically keep
vs18.7 up to date, so I've opened this PR.

This PR merges commits made on vs18.6 by the following committers:

* @AlesProkop
* @dotnet-maestro[bot]

## Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete
this PR by creating a merge commit, *not* a squash or rebase commit.

<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />

If this repo does not allow creating merge commits from the GitHub UI,
use command line instructions.

## Instructions for merging via command line

Run these commands to merge this pull request from the command line.

``` sh
git fetch
git checkout vs18.6
git pull --ff-only
git checkout vs18.7
git pull --ff-only
git merge --no-ff vs18.6

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs18.6-to-vs18.7
```

<details>
<summary>or if you are using SSH</summary>

```
git push git@github.com:dotnet/msbuild HEAD:merge/vs18.6-to-vs18.7
```

</details>


After PR checks are complete push the branch
```
git push
```

## Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].

[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by
pushing to the branch 'merge/vs18.6-to-vs18.7'. This can be done to
resolve conflicts or make other changes to this pull request before it
is merged.
The provided examples assume that the remote is named 'origin'. If you
have a different remote name, please replace 'origin' with the name of
your remote.

```
git fetch
git checkout -b merge/vs18.6-to-vs18.7 origin/vs18.7
git pull https://github.com/dotnet/msbuild merge/vs18.6-to-vs18.7
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs18.6-to-vs18.7
```

<details>
    <summary>or if you are using SSH</summary>

```
git fetch
git checkout -b merge/vs18.6-to-vs18.7 origin/vs18.7
git pull git@github.com:dotnet/msbuild merge/vs18.6-to-vs18.7
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs18.6-to-vs18.7
```

</details>

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or
issues.
Also, if this PR was generated incorrectly, help us fix it. See
https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
@github-actions github-actions Bot requested a review from a team as a code owner June 4, 2026 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants