Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Sep 1, 2025

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:

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

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

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.

maridematte and others added 21 commits April 22, 2025 11:08
…nse headers

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

----
#### AI description  (iteration 2)
#### PR Classification
Bug fix

#### PR Summary
This pull request updates the `DownloadFile` task to avoid relying on response headers for determining the file name.
- `src/Tasks/DownloadFile.cs`: Modified `TryGetFileName` method to use the request URI instead of the response headers to determine the file name. Updated method calls accordingly.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Fixes #

### Context


### Changes Made


### Testing


### Notes
Update version of package in PrebuiltBaseline for resolve the issue in
internal build pipeline
Fix ##12398

Use MicroBuildSigningPlugin@4 and split pipeline on prod and exp.
Exp run:
https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=12265616&view=results
Add inter-branch merge flow file to get auto-merge run on vs16.11.
Co-authored-by: Jan Provazník <[email protected]>
Co-authored-by: Copilot <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner September 1, 2025 09:12
@dotnet-policy-service
Copy link
Contributor

Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.

@github-actions
Copy link
Contributor Author

github-actions bot commented Sep 1, 2025

This pull request has been updated.

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

@GangWang01 GangWang01 force-pushed the merge/vs16.11-to-vs17.8 branch from d56fbba to b499604 Compare September 2, 2025 06:14
@GangWang01 GangWang01 force-pushed the merge/vs16.11-to-vs17.8 branch from b499604 to c98d87e Compare September 2, 2025 06:16
@GangWang01 GangWang01 merged commit c01022a into vs17.8 Sep 2, 2025
9 checks passed
@GangWang01 GangWang01 deleted the merge/vs16.11-to-vs17.8 branch September 2, 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.

8 participants