Skip to content

[automated] Merge branch 'vs17.8' => 'vs17.10'#5

Open
github-actions[bot] wants to merge 92 commits intovs17.10from
merge/vs17.8-to-vs17.10
Open

[automated] Merge branch 'vs17.8' => 'vs17.10'#5
github-actions[bot] wants to merge 92 commits intovs17.10from
merge/vs17.8-to-vs17.10

Conversation

@github-actions
Copy link

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:

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.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/JanProvaznik/msbuild HEAD:merge/vs17.8-to-vs17.10
or if you are using SSH
git push git@github.com:JanProvaznik/msbuild HEAD:merge/vs17.8-to-vs17.10

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

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.

Forgind and others added 30 commits June 20, 2023 21:28
[vs17.6] Dont ngen taskhost Fixes our lack of optprof data (dotnet#8737)
Update System.Security.Cryptography.Pkcs
* Bump Microsoft.IO.Redist to 6.0.1

* Bump System.Formats.Asn1 to 8.0.1

* Bump System.Text.Json to 8.0.0.4

* Bump the dependencies of System.Text.Json

* Add System.Formats.Asn1 8.0.1 to the pre-built exception list

* Bump version prefix to 17.8.8

* Updated System.Collection.Immutable package to v8

* Adding System.Collections.Immutable 8.0.0 to the pre-built exception list

* Updated Version.Details.xml
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk

* remove BuildXL from nuget config

* compatibility suppressions

* Update dependencies from https://github.com/dotnet/arcade build 20241…

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions

 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1

* include PortableRuntimeIdentifierGraph.json

* Suppress a warning IDE0305

* bump version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20241112.12

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12

* Update VersionPrefix to 17.8.11

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
…120.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5
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
- **Build**: 20241120.5
- **Date Produced**: November 20, 2024 10:02:02 PM UTC
- **Commit**: 3c7e11bf80279cde53a6251c4d0fa10e613fc739
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24562.12 to
8.0.0-beta.24570.5][1]
- **Microsoft.DotNet.XUnitExtensions**: [from 8.0.0-beta.24562.12 to
8.0.0-beta.24570.5][1]

[1]: dotnet/arcade@42652ca...3c7e11b

[DependencyUpdate]: <> (End)


[marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38)
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
* fix setting package versions

* use VS branch names in servicing package decision

---------

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
* Update vs/msbuild version

* Bump version
surayya-MS and others added 30 commits May 22, 2025 16:53
Fixes #

### Context


### Changes Made


### Testing


### Notes
Fixes #

### Context


### Changes Made


### Testing


### Notes
* Update dependencies from https://github.com/dotnet/arcade build 20250414.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7

* Update VersionPrefix to 17.8.27

* Update dependencies from https://github.com/dotnet/arcade build 20250425.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25225.5

* Update dependencies from https://github.com/dotnet/arcade build 20250430.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25230.1

* Update dependencies from https://github.com/dotnet/arcade build 20250513.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25263.4

* Update dependencies from https://github.com/dotnet/arcade build 20250514.2

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

* bump VersionPrefix to 17.8.30

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
* 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 <v-gaw@microsoft.com>
* 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 <43189610+huulinhnguyen-dev@users.noreply.github.com>
Update version of package in PrebuiltBaseline for resolve the issue in
internal build pipeline
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 <huulinhnguyen99@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**:
[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 <95473390+YuliiaKovalova@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**:
[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 <v-gaw@microsoft.com>
Add inter-branch merge flow file to get auto-merge run on vs16.11.
Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
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:

* @YuliiaKovalova
* @GangWang01
* @huulinhnguyen-dev
* @dotnet-maestro[bot]
* @rainersigwald
* @surayya-MS
* @maridematte

## 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://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/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.
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**:
[20250827.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2781392)
- **Date Produced**: August 27, 2025 10:24:08 PM UTC
- **Commit**:
[6e78cc9faf0ab29992b01007d71519655344e74c](dotnet/arcade@6e78cc9)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

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

[1]: dotnet/arcade@3e8ada7...6e78cc9

[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 <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**:
[20250905.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2787027)
([282118](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/282118))
- **Date Produced**: September 5, 2025 2:36:46 PM UTC
- **Commit**:
[09625cb3b98ebe646a63dfea19a0c0127e88459a](dotnet/arcade@09625cb)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

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

[1]: dotnet/arcade@6e78cc9...09625cb

[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 <v-gaw@microsoft.com>
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.

10 participants