Skip to content

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

Merged
surayya-MS merged 12 commits intovs17.10from
merge/vs17.8-to-vs17.10
May 30, 2025
Merged

[automated] Merge branch 'vs17.8' => 'vs17.10'#11904
surayya-MS merged 12 commits intovs17.10from
merge/vs17.8-to-vs17.10

Conversation

@github-actions
Copy link
Contributor

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

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 April 8, 2025 11:04
* Update dependencies from https://github.com/dotnet/arcade build 20250404.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25111.4 -> To Version 8.0.0-beta.25204.7

* Update Versions.props VersionPrefix

* Update PreReleaseVersionLabel to 'servicing'

---------

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

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

* Update VersionPrefix to 17.8.26

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
DownloadFile should not rely on the remote server response headers. Unless the DestinationFileName task parameter is specified - let's just fallback to the request URI - which is as well the publicly documented behavior.
revert 10725 to unblock VS insertions by matching 17.8 VS versions.
We're doing a version bump so all branches have up-to-date opt-prof runs.

[Opt-prof version](https://dev.azure.com/devdiv/_apps/hub/ms-vscs-artifact.build-tasks.drop-hub-group-explorer-hub?name=OptimizationData/DotNet-msbuild-Trusted/internal/vs17.8/20250416.5/11417138/1)

----
#### AI description  (iteration 1)
#### PR Classification
Version update.

#### PR Summary
This pull request updates the version prefix in the project configuration.
- `eng/Versions.props`: Updated `<VersionPrefix>` from `17.8.28` to `17.8.29`.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Fixes #

### Context


### Changes Made


### Testing


### Notes
@github-actions github-actions bot requested a review from a team as a code owner May 26, 2025 08:47
* 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>
@github-actions
Copy link
Contributor Author

This pull request has been updated.

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

@surayya-MS surayya-MS force-pushed the merge/vs17.8-to-vs17.10 branch 3 times, most recently from 7ec7775 to d832838 Compare May 30, 2025 10:31
@surayya-MS surayya-MS force-pushed the merge/vs17.8-to-vs17.10 branch from 9c5bf2b to d832838 Compare May 30, 2025 10:38
@surayya-MS surayya-MS force-pushed the merge/vs17.8-to-vs17.10 branch from 5416bcc to bfb7771 Compare May 30, 2025 10:49
@surayya-MS surayya-MS merged commit b6c2ecb into vs17.10 May 30, 2025
10 checks passed
@surayya-MS surayya-MS deleted the merge/vs17.8-to-vs17.10 branch May 30, 2025 11:51
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