[automated] Merge branch 'vs17.14' => 'main' #11572
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…: Build ID 11081403
…ries in Version.Details.xml (#11571) * Remove deprecated 4.3.* package references Both "System.Runtime" and "System.Private.Uri" are inbox in .NETCoreApp since ~2017 and don't need to be referenced explicitly anymore. They were referenced here as external dependencies brought vulnerable netstandard1.x dependencies in which were then flagged by CG. That isn't the case anymore. xunit, shouldly and other packages with their corresponding versions used in this repo don't bring netstandard1.x in anymore. Don't reference "System.Net.Http" for the same reason. It is inbox on .NET Framework, .NETCoreApp and .NET Standard. On .NET Framework a "<Reference Include="System.Net.Http" />" item is needed as it isn't part of the default referenced assemblies. Note that this change will help when starting to consume a .NET 10 SDK as those would get flagged by NuGet Prune Package Reference and NuGet Audit. * Avoid netstandard1.x dependencies * fix build * Fix entries in Version.Details.xml and make version overriding clearer (#11561) Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377. Also simplified the way we reference the different package versions a bit to make it clearer. Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals --------- Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
|
This pull request has been updated. This PR merges commits made on vs17.14 by the following committers:
|
This assembly shouldn't ever be loaded in the net4x context so don't spend the install time ngening it.
|
This pull request has been updated. This PR merges commits made on vs17.14 by the following committers:
|
…: Build ID 11098688 (#11501) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
…e/vs17.13-to-vs17.14
I detected changes in the vs17.13 branch which have not been merged yet to vs17.14. I'm a robot and am configured to help you automatically keep vs17.14 up to date, so I've opened this PR. This PR merges commits made on vs17.13 by the following committers: * @maridematte * @JaynieBai * @dotnet-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.13 git pull --ff-only git checkout vs17.14 git pull --ff-only git merge --no-ff vs17.13 # 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.13-to-vs17.14 ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14 ``` </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.13-to-vs17.14'. 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.13-to-vs17.14 origin/vs17.14 git pull https://github.com/dotnet/msbuild merge/vs17.13-to-vs17.14 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.13-to-vs17.14 origin/vs17.14 git pull [email protected]:dotnet/msbuild merge/vs17.13-to-vs17.14 (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/msbuild HEAD:merge/vs17.13-to-vs17.14 ``` </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 has been updated. This PR merges commits made on vs17.14 by the following committers:
|
JaynieBai
approved these changes
Mar 17, 2025
Context The VS insertion is currently failing due to the SolutionParser version being upgraded beyond the version used by VS. Made the change so this reference is not exposed and so the insertions do not fail.
|
This pull request has been updated. This PR merges commits made on vs17.14 by the following committers:
|
maridematte
approved these changes
Mar 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the vs17.14 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on vs17.14 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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.14-to-main'. 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.
or if you are using SSH
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.