[automated] Merge branch 'vs18.0' => 'main' #12947
Open
+1
−0
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
This pull request updates the following dependencies [marker]: <> (Begin:15388ba0-faaf-4906-bba2-a9b719e812a4) ## From https://github.com/dotnet/arcade - **Subscription**: [15388ba0-faaf-4906-bba2-a9b719e812a4](https://maestro.dot.net/subscriptions?search=15388ba0-faaf-4906-bba2-a9b719e812a4) - **Build**: [20251105.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2832013) ([289663](https://maestro.dot.net/channel/5175/github:dotnet:arcade/build/289663)) - **Date Produced**: November 5, 2025 7:38:32 PM UTC - **Commit**: [9eaf7b289d5003a94ee23658f057a6c06ddcd570](dotnet/arcade@9eaf7b2) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [9.0.0-beta.25515.2 to 9.0.0-beta.25555.4][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XliffTasks - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6666973...9eaf7b2 [DependencyUpdate]: <> (End) [marker]: <> (End:15388ba0-faaf-4906-bba2-a9b719e812a4) --------- 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:15388ba0-faaf-4906-bba2-a9b719e812a4) ## From https://github.com/dotnet/arcade - **Subscription**: [15388ba0-faaf-4906-bba2-a9b719e812a4](https://maestro.dot.net/subscriptions?search=15388ba0-faaf-4906-bba2-a9b719e812a4) - **Build**: [20251112.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2837083) ([290502](https://maestro.dot.net/channel/5175/github:dotnet:arcade/build/290502)) - **Date Produced**: November 12, 2025 5:37:34 PM UTC - **Commit**: [6e2d8e204cebac7d3989c1996f96e5a9ed63fa80](dotnet/arcade@6e2d8e2) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [9.0.0-beta.25555.4 to 9.0.0-beta.25562.4][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XliffTasks - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@9eaf7b2...6e2d8e2 [DependencyUpdate]: <> (End) [marker]: <> (End:15388ba0-faaf-4906-bba2-a9b719e812a4) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: huulinh99 <huulinhnguyen99@gmail.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Removed audit sources section from NuGet.config. backport: #12641
The localization has to be enabled to service the change with the new error message (#12662)
**Description** Running tests with dotnet test, users see inconsistent number of projects and tests reported in the view. This is a UI only issue, failing tests will still fail the build. It is still worth fixing the issue because it makes the runs show repeatable numbers of tests to the user. The terminal node can be null before we receive the finish message. This will cause that some summaries are not accounted for and will be missing in the final output. The node is null for this reason: #12819 That fix is not backported. **Customer Impact:** Multiple runs of the same test suite report different total counts of tests and projects. **Regression?** No, this was never working correctly since the beginning of test reporting in Terminal Logger. **Risk:** Low, it impacts UI only. Link the PR to the original issue and to the PR to main. PR to main is merged: #12801 Fixes microsoft/vstest#15307 No additional impact on packages or localization.
This pull request updates the following dependencies [marker]: <> (Begin:27a5292e-3437-4838-b48c-942f591a53bf) ## From https://github.com/dotnet/arcade - **Subscription**: [27a5292e-3437-4838-b48c-942f591a53bf](https://maestro.dot.net/subscriptions?search=27a5292e-3437-4838-b48c-942f591a53bf) - **Build**: [20251205.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2854947) ([293600](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/293600)) - **Date Produced**: December 6, 2025 12:55:25 AM UTC - **Commit**: [774a2ef8d2777c50d047d6776ced33260822cad6](dotnet/arcade@774a2ef) - **Branch**: [release/10.0](https://github.com/dotnet/arcade/tree/release/10.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [10.0.0-beta.25469.2 to 10.0.0-beta.25605.3][8] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [8]: dotnet/arcade@6275af4...774a2ef [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates **tools.dotnet** to 10.0.100 [marker]: <> (End:27a5292e-3437-4838-b48c-942f591a53bf) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Jan Provazník <janprovaznik@microsoft.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
This pull request updates the following dependencies [marker]: <> (Begin:15388ba0-faaf-4906-bba2-a9b719e812a4) ## From https://github.com/dotnet/arcade - **Subscription**: [15388ba0-faaf-4906-bba2-a9b719e812a4](https://maestro.dot.net/subscriptions?search=15388ba0-faaf-4906-bba2-a9b719e812a4) - **Build**: [20251127.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2849049) ([292541](https://maestro.dot.net/channel/5175/github:dotnet:arcade/build/292541)) - **Date Produced**: November 27, 2025 8:31:46 PM UTC - **Commit**: [0890ca08513391dafe556fb326c73c6c5c6cb329](dotnet/arcade@0890ca0) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [9.0.0-beta.25562.4 to 9.0.0-beta.25577.5][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XliffTasks - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6e2d8e2...0890ca0 [DependencyUpdate]: <> (End) [marker]: <> (End:15388ba0-faaf-4906-bba2-a9b719e812a4) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: huulinh99 <huulinhnguyen99@gmail.com>
…: Build ID 12921813 (#12897) 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. --------- Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Disable Localization for vs17.14
I detected changes in the vs17.14 branch which have not been merged yet to vs18.0. I'm a robot and am configured to help you automatically keep vs18.0 up to date, so I've opened this PR. This PR merges commits made on vs17.14 by the following committers: * @YuliiaKovalova * @dotnet-bot * @dotnet-maestro[bot] * @nohwnd * @Copilot ## 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.14 git pull --ff-only git checkout vs18.0 git pull --ff-only git merge --no-ff vs17.14 # 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.14-to-vs18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0 ``` </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.14-to-vs18.0'. 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.14-to-vs18.0 origin/vs18.0 git pull https://github.com/dotnet/msbuild merge/vs17.14-to-vs18.0 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.14-to-vs18.0 origin/vs18.0 git pull git@github.com:dotnet/msbuild merge/vs17.14-to-vs18.0 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0 ``` </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:27a5292e-3437-4838-b48c-942f591a53bf) ## From https://github.com/dotnet/arcade - **Subscription**: [27a5292e-3437-4838-b48c-942f591a53bf](https://maestro.dot.net/subscriptions?search=27a5292e-3437-4838-b48c-942f591a53bf) - **Build**: [20251212.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2859988) ([294548](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/294548)) - **Date Produced**: December 12, 2025 9:05:08 PM UTC - **Commit**: [55631983c8583162122687fddeac13424c1e40a8](dotnet/arcade@5563198) - **Branch**: [release/10.0](https://github.com/dotnet/arcade/tree/release/10.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [10.0.0-beta.25605.3 to 10.0.0-beta.25612.5][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@774a2ef...5563198 [DependencyUpdate]: <> (End) [marker]: <> (End:27a5292e-3437-4838-b48c-942f591a53bf) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: huulinh99 <huulinhnguyen99@gmail.com> Co-authored-by: Nguyen Huu Linh <43189610+huulinhnguyen-dev@users.noreply.github.com>
Contributor
Author
|
This pull request has been updated. This PR merges commits made on vs18.0 by the following committers: |
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 vs18.0 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 vs18.0 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/vs18.0-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.