镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

[automated] Merge branch 'vs17.8' => 'vs17.11' - #14722

Merged
ViktorHofer merged 11 commits into
vs17.11from
merge/vs17.8-to-vs17.11
Aug 17, 2026
Merged

ViktorHofer merged 11 commits into
vs17.11from
merge/vs17.8-to-vs17.11

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

I detected changes in the vs17.8 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.8 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.8
git pull --ff-only
git checkout vs17.11
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.11
or if you are using SSH
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-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.8-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.8-to-vs17.11 origin/vs17.11
git pull https://github.com/dotnet/msbuild merge/vs17.8-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.11
or if you are using SSH
git fetch
git checkout -b merge/vs17.8-to-vs17.11 origin/vs17.11
git pull git@github.com:dotnet/msbuild merge/vs17.8-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-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 10 commits January 26, 2026 10:19
This pull request updates the following dependencies

[marker]: <> (Begin:7b5493ca-b4a1-4721-882d-d9a1079276dd)
## From https://github.com/dotnet/arcade
- **Subscription**:
[7b5493ca-b4a1-4721-882d-d9a1079276dd](https://maestro.dot.net/subscriptions?search=7b5493ca-b4a1-4721-882d-d9a1079276dd)
- **Build**:
[20260122.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2885007)
([298391](https://maestro.dot.net/channel/2293/github:dotnet:arcade/build/298391))
- **Date Produced**: January 22, 2026 9:16:20 AM UTC
- **Commit**:
[a76bbdaad613727e7b7b5ed426e45c33e0014340](dotnet/arcade@a76bbda)
- **Branch**:
[release/6.0](https://github.com/dotnet/arcade/tree/release/6.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [6.0.0-beta.25468.4 to 6.0.0-beta.26072.1][1]
     - Microsoft.DotNet.Arcade.Sdk

[1]: dotnet/arcade@4fd02da...a76bbda

[DependencyUpdate]: <> (End)


[marker]: <> (End:7b5493ca-b4a1-4721-882d-d9a1079276dd)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
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**:
[20260528.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2986525)
([316242](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/316242))
- **Date Produced**: May 28, 2026 9:35:33 PM UTC
- **Commit**:
[4b95fb1a9307265eb75f62d4937be50e6786e94e](dotnet/arcade@4b95fb1)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-beta.26224.3 to 8.0.0-beta.26278.3][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@d9af20b...4b95fb1

[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: Gang Wang (BEYONDSOFT CONSULTING INC) <v-gaw@microsoft.com>
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**:
[20260716.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=3024526)
([323243](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/323243))
- **Date Produced**: July 17, 2026 1:32:52 AM UTC
- **Commit**:
[fa3a7db45515f8cc0592762295def1cbb99d141c](dotnet/arcade@fa3a7db)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-beta.26278.3 to 8.0.0-beta.26366.9][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@4b95fb1...fa3a7db

[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: Aleš Prokop <ales.prokop.dev@gmail.com>
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**:
[20260721.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=3028079)
([323781](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/323781))
- **Date Produced**: July 21, 2026 5:31:13 PM UTC
- **Commit**:
[444c2ef3c414558e2e409ee346f1faebb19687eb](dotnet/arcade@444c2ef)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-beta.26366.9 to 8.0.0-beta.26371.5][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[1]: dotnet/arcade@fa3a7db...444c2ef

[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: Aleš Prokop <ales.prokop.dev@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 6848fa3e-fc2d-4637-8a58-0ceb2acbe488
This pull request updates the following dependencies

[marker]: <> (Begin:7b5493ca-b4a1-4721-882d-d9a1079276dd)
## From https://github.com/dotnet/arcade
- **Subscription**:
[7b5493ca-b4a1-4721-882d-d9a1079276dd](https://maestro.dot.net/subscriptions?search=7b5493ca-b4a1-4721-882d-d9a1079276dd)
- **Build**:
[20260810.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=3043872)
([326444](https://maestro.dot.net/channel/2293/github:dotnet:arcade/build/326444))
- **Date Produced**: August 10, 2026 5:30:38 PM UTC
- **Commit**:
[655b0d1fc662ee449457c1796821426bc5745b26](dotnet/arcade@655b0d1)
- **Branch**:
[release/6.0](https://github.com/dotnet/arcade/tree/release/6.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [6.0.0-beta.26072.1 to 6.0.0-beta.26410.7][2]
     - Microsoft.DotNet.Arcade.Sdk

[2]: dotnet/arcade@a76bbda...655b0d1

[DependencyUpdate]: <> (End)


[marker]: <> (End:7b5493ca-b4a1-4721-882d-d9a1079276dd)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
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**:
[20260811.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=3044932)
([326584](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/326584))
- **Date Produced**: August 11, 2026 5:16:20 PM UTC
- **Commit**:
[7945b1b660dff1927e4d71aca0a11e5d067ba4a5](dotnet/arcade@7945b1b)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-beta.26371.5 to 8.0.0-beta.26411.4][2]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.XUnitExtensions

[2]: dotnet/arcade@444c2ef...7945b1b

[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: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
…4718)

Ports #14710 (commit
b6d968a) to this servicing branch.

The `AzureDevOps-Artifact-Feeds-Pats` variable group is no longer
active, and referencing it fails the official build. It is no longer
needed after dotnet/arcade#17245.

`$(dn-bot-dnceng-artifact-feeds-rw)` is still consumed by the `Setup
Private Feeds Credentials` steps and is now provided without this group,
matching `main`.

### Why only one file here

Unlike `main`, this branch references the group in exactly one place.
Its `.vsts-dotnet-ci.yml` and `.vsts-dotnet.yml` predate the group being
added, so there is nothing to remove there. This change therefore fully
removes the group from `vs16.11`.

### Other branches

This commit also fully covers `vs17.8`, which has the same single
reference, so `vs17.8` needs no separate PR and is handled by merge
flow.

`vs17.11` and everything newer reference the group in all three files
and are handled by #14719, which is a complete self-contained port of
#14710.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8527d316-639a-4568-9560-43af8df52c15
I detected changes in the vs16.11 branch which have not been merged yet
to vs17.8. I'm a robot and am configured to help you automatically keep
vs17.8 up to date, so I've opened this PR.

This PR merges commits made on vs16.11 by the following committers:

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

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

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

```
git push git@github.com:dotnet/msbuild HEAD:merge/vs16.11-to-vs17.8
```

</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://github.com/proxy/help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://github.com/proxy/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/vs16.11-to-vs17.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/vs16.11-to-vs17.8 origin/vs17.8
git pull https://github.com/dotnet/msbuild merge/vs16.11-to-vs17.8
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs16.11-to-vs17.8
```

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

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

</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 August 17, 2026 13:23
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.

2 participants