Skip to content

Conversation

@github-actions
Copy link
Contributor

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:

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

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.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
or if you are using SSH
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

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 12 commits November 10, 2025 10:33
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: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
@github-actions github-actions bot requested a review from a team as a code owner December 11, 2025 08:00
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.

6 participants