Skip to content

[automated] Merge branch 'vs17.10' => 'vs17.11'#11475

Merged
GangWang01 merged 54 commits intovs17.11from
merge/vs17.10-to-vs17.11
Feb 21, 2025
Merged

[automated] Merge branch 'vs17.10' => 'vs17.11'#11475
GangWang01 merged 54 commits intovs17.11from
merge/vs17.10-to-vs17.11

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 git@github.com: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 git@github.com:dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.

Forgind and others added 30 commits June 20, 2023 21:28
[vs17.6] Dont ngen taskhost Fixes our lack of optprof data (#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
JanKrivanek and others added 22 commits December 11, 2024 15:40
* Update dependencies from https://github.com/dotnet/arcade build 20241223.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2

* Update VersionPrefix to 17.8.16

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
* Update dependencies from https://github.com/dotnet/arcade build 20250110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1

* version bump

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
* Update .vsts-dotnet.yml

* Update Versions.props

* Update .vsts-dotnet.yml

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

* Bump version

---------

Co-authored-by: Rainer Sigwald <raines@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250116.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25066.6

* Bump version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250205.2

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

* Update Versions.props VersionPrefix

---------

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 20250205.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25105.2

* bump version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>
…211.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25111.4
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**: 20250211.4
- **Date Produced**: February 11, 2025 11:57:42 PM UTC
- **Commit**: a319ada170a54ee87c7a81e3309948e3d3ea7aca
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

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

[1]: dotnet/arcade@f9e274e...a319ada

[DependencyUpdate]: <> (End)

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

[marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38)
* remove optprof image name, rely on default

* restore arcade tools with correct nuget.config

* bump version
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]
* @JanKrivanek
* @JanProvaznik
* @GangWang01
* @github-actions[bot]
* @surayya-MS
* @YuliiaKovalova
* @sujitnayak

## 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 git@github.com: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 git@github.com:dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.
* Update dependencies from https://github.com/dotnet/arcade build 20250211.4

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

* Update VersionPrefix to 17.10.22

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

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

---------

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: Jan Provaznik <janprovaznik@microsoft.com>
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:

* @github-actions[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 git@github.com: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 git@github.com:dotnet/msbuild merge/vs17.8-to-vs17.10
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.
@github-actions github-actions bot requested a review from a team as a code owner February 21, 2025 06:07
@github-actions github-actions bot force-pushed the merge/vs17.10-to-vs17.11 branch from effe323 to f305233 Compare February 21, 2025 06:07
@GangWang01 GangWang01 merged commit b4a2592 into vs17.11 Feb 21, 2025
10 checks passed
@GangWang01 GangWang01 deleted the merge/vs17.10-to-vs17.11 branch February 21, 2025 08:31
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.

7 participants