Visitar URL original
[main] Source code updates from microsoft/vstest by dotnet-maestro[bot] · Pull Request #3597 · dotnet/dotnet · GitHub
Skip to content

[main] Source code updates from microsoft/vstest - #3597

Merged
dotnet-maestro[bot] merged 3 commits into
mainfrom
darc-main-4783b6e7-57fe-4b1e-9075-c422e372ef98
Dec 1, 2025
Merged

[main] Source code updates from microsoft/vstest#3597
dotnet-maestro[bot] merged 3 commits into
mainfrom
darc-main-4783b6e7-57fe-4b1e-9075-c422e372ef98

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Nov 28, 2025

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/microsoft/vstest

@dotnet-maestro

dotnet-maestro Bot commented Nov 28, 2025

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Nov 28, 2025

Copy link
Copy Markdown
Contributor Author

Caution

There are conflicts with the main branch in this PR.
Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file src/source-manifest.json.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

{
  "barId": 292023,
  "path": "vstest",
  "remoteUri": "https://github.com/microsoft/vstest",
  "commitSha": "154e8babf0b97312a403b6ccf84cf1498a32ecea"
}

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@premun

premun commented Nov 28, 2025

Copy link
Copy Markdown
Member

@nohwnd can you check the changes? I know you had some concerns about the branding and if this is coming from the right branch

nohwnd
nohwnd approved these changes Dec 1, 2025
View reviewed changes

@nohwnd nohwnd left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look correct.

My concerns were about 0.2.0-preview.25556.111 but not in this flow. We update that in vstest, and then we get it also updated by backflow from dotnet/dotnet, which I did not understand why.

@dotnet-maestro
dotnet-maestro Bot merged commit e12a7e5 into main Dec 1, 2025
16 checks passed
@dotnet-maestro
dotnet-maestro Bot deleted the darc-main-4783b6e7-57fe-4b1e-9075-c422e372ef98 branch December 1, 2025 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nohwnd nohwnd nohwnd approved these changes
@dkurepa dkurepa dkurepa approved these changes

Assignees

No one assigned

Labels

None yet

Projects

.NET Unified Build
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@premun @nohwnd @dkurepa