Skip to content

Conversation

@github-actions
Copy link
Contributor

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

This PR merges commits made on vs17.10 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 vs17.10
git pull --ff-only
git checkout vs17.11
git pull --ff-only
git merge --no-ff vs17.10

# 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/vs17.10-to-vs17.11
or if you are using SSH
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11

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/vs17.10-to-vs17.11'. 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/vs17.10-to-vs17.11 origin/vs17.11
git pull https://github.com/dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
or if you are using SSH
git fetch
git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11
git pull [email protected]:dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11

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 23 commits June 13, 2025 09:08
* Update dependencies from https://github.com/dotnet/arcade build 20250610.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3

* Update VersionPrefix to 17.8.31

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20250610.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3

* Update VersionPrefix to 17.10.32

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20250626.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1

* Update VersionPrefix for 17.8

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nguyen Huu Linh <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20250626.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1

* Update VersionPrefix for vs17.10

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nguyen Huu Linh <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80)
## From https://github.com/dotnet/arcade
- **Subscription**:
[42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80)
- **Build**:
[20250716.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2751532)
- **Date Produced**: July 16, 2025 7:28:41 PM UTC
- **Commit**:
[a73c08ec0de5a6e5e2a8668837df67edecb3a3da](dotnet/arcade@a73c08e)
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25326.1 to 8.0.0-beta.25366.2][1]
    - Microsoft.SourceBuild.Intermediate.arcade
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@6e3320b...a73c08e

[DependencyUpdate]: <> (End)


[marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80)
## From https://github.com/dotnet/arcade
- **Subscription**:
[42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80)
- **Build**:
[20250728.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2759925)
- **Date Produced**: July 28, 2025 7:56:32 PM UTC
- **Commit**:
[8dca4f8ae100b102230287f8cc1b75264c9f1a6f](dotnet/arcade@8dca4f8)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25366.2 to 8.0.0-beta.25378.1][1]
    - Microsoft.SourceBuild.Intermediate.arcade
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@a73c08e...8dca4f8

[DependencyUpdate]: <> (End)


[marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: huulinh99 <[email protected]>
I detected changes in the vs17.8 branch which have not been merged yet
to vs17.10. I'm a robot and am configured to help you automatically keep
vs17.10 up to date, so I've opened this PR.

This PR merges commits made on vs17.8 by the following committers:

* @GangWang01
* @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 vs17.8
git pull --ff-only
git checkout vs17.10
git pull --ff-only
git merge --no-ff vs17.8

# 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/vs17.8-to-vs17.10
```

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

```
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

</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/vs17.8-to-vs17.10'. 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/vs17.8-to-vs17.10 origin/vs17.10
git pull https://github.com/dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

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

```
git fetch
git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10
git pull [email protected]:dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

</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.

---------

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Co-authored-by: Nguyen Huu Linh <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:5f9c9524-456b-43ca-a978-063daaf53c38)
## From https://github.com/dotnet/arcade
- **Subscription**:
[5f9c9524-456b-43ca-a978-063daaf53c38](https://maestro.dot.net/subscriptions?search=5f9c9524-456b-43ca-a978-063daaf53c38)
- **Build**:
[20250807.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2767075)
- **Date Produced**: August 7, 2025 4:53:08 PM UTC
- **Commit**:
[a5ec3fab69ac440afe6764b2e046af6e8fcafa74](dotnet/arcade@a5ec3fa)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25378.1 to 8.0.0-beta.25407.1][1]
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@8dca4f8...a5ec3fa

[DependencyUpdate]: <> (End)

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

[marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: huulinh99 <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80)
## From https://github.com/dotnet/arcade
- **Subscription**:
[42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80)
- **Build**:
[20250807.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2767075)
- **Date Produced**: August 7, 2025 4:53:08 PM UTC
- **Commit**:
[a5ec3fab69ac440afe6764b2e046af6e8fcafa74](dotnet/arcade@a5ec3fa)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25378.1 to 8.0.0-beta.25407.1][1]
    - Microsoft.SourceBuild.Intermediate.arcade
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@8dca4f8...a5ec3fa

[DependencyUpdate]: <> (End)


[marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: huulinh99 <[email protected]>
I detected changes in the vs17.8 branch which have not been merged yet
to vs17.10. I'm a robot and am configured to help you automatically keep
vs17.10 up to date, so I've opened this PR.

This PR merges commits made on vs17.8 by the following committers:

* @dotnet-maestro[bot]
* @GangWang01

## 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 vs17.8
git pull --ff-only
git checkout vs17.10
git pull --ff-only
git merge --no-ff vs17.8

# 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/vs17.8-to-vs17.10
```

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

```
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

</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/vs17.8-to-vs17.10'. 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/vs17.8-to-vs17.10 origin/vs17.10
git pull https://github.com/dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

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

```
git fetch
git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10
git pull [email protected]:dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10
```

</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.

---------

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Co-authored-by: Nguyen Huu Linh <[email protected]>
Co-authored-by: huulinh99 <[email protected]>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:5f9c9524-456b-43ca-a978-063daaf53c38)
## From https://github.com/dotnet/arcade
- **Subscription**:
[5f9c9524-456b-43ca-a978-063daaf53c38](https://maestro.dot.net/subscriptions?search=5f9c9524-456b-43ca-a978-063daaf53c38)
- **Build**:
[20250815.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2772918)
- **Date Produced**: August 15, 2025 6:50:02 PM UTC
- **Commit**:
[2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596](dotnet/arcade@2f70e45)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25407.1 to 8.0.0-beta.25415.2][1]
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@a5ec3fa...2f70e45

[DependencyUpdate]: <> (End)


[marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:5f9c9524-456b-43ca-a978-063daaf53c38)
## From https://github.com/dotnet/arcade
- **Subscription**:
[5f9c9524-456b-43ca-a978-063daaf53c38](https://maestro.dot.net/subscriptions?search=5f9c9524-456b-43ca-a978-063daaf53c38)
- **Build**:
[20250822.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2777854)
- **Date Produced**: August 22, 2025 10:29:07 AM UTC
- **Commit**:
[3e8ada7bce86d4218abd6d9a40daadddabdf16c9](dotnet/arcade@3e8ada7)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25415.2 to 8.0.0-beta.25422.2][1]
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@2f70e45...3e8ada7

[DependencyUpdate]: <> (End)

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

[marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
This pull request updates the following dependencies

[marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80)
## From https://github.com/dotnet/arcade
- **Subscription**:
[42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80)
- **Build**:
[20250822.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2777854)
- **Date Produced**: August 22, 2025 10:29:07 AM UTC
- **Commit**:
[3e8ada7bce86d4218abd6d9a40daadddabdf16c9](dotnet/arcade@3e8ada7)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - From [8.0.0-beta.25415.2 to 8.0.0-beta.25422.2][1]
    - Microsoft.SourceBuild.Intermediate.arcade
    - Microsoft.DotNet.Arcade.Sdk
    - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@2f70e45...3e8ada7

[DependencyUpdate]: <> (End)


[marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
@github-actions github-actions bot force-pushed the merge/vs17.10-to-vs17.11 branch from 56ecb9f to 550b208 Compare August 27, 2025 15:58
@github-actions github-actions bot requested a review from a team as a code owner August 27, 2025 15:58
@YuliiaKovalova
Copy link
Member

@YuliiaKovalova YuliiaKovalova enabled auto-merge (squash) August 28, 2025 09:36
@YuliiaKovalova YuliiaKovalova merged commit a0d1c24 into vs17.11 Aug 28, 2025
10 checks passed
@YuliiaKovalova YuliiaKovalova deleted the merge/vs17.10-to-vs17.11 branch August 28, 2025 10:14
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.

4 participants