Skip to content

[main] Source code updates from dotnet/dotnet#13735

Merged
dotnet-maestro[bot] merged 3 commits into
mainfrom
darc-main-74c4ed9a-e19a-4b16-bd97-8838fedba456
May 13, 2026
Merged

[main] Source code updates from dotnet/dotnet#13735
dotnet-maestro[bot] merged 3 commits into
mainfrom
darc-main-74c4ed9a-e19a-4b16-bd97-8838fedba456

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

Note

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

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:547c640d5626b2976499cb3433abc741a63d67c5..https://github.com/dotnet/msbuild:darc-main-74c4ed9a-e19a-4b16-bd97-8838fedba456

@dotnet-maestro dotnet-maestro Bot requested a review from a team as a code owner May 12, 2026 02:04
@GangWang01 GangWang01 self-assigned this May 12, 2026
@JanProvaznik
Copy link
Copy Markdown
Member

@GangWang01

  1. what is the issue with xUnit and MSTestingPlatform?
  2. where does that change come from in dotnet/dotnet?

@GangWang01
Copy link
Copy Markdown
Member

@GangWang01

  1. what is the issue with xUnit and MSTestingPlatform?

@JanProvaznik The change removed the version specification and it caused package version conflicts. See https://dev.azure.com/dnceng-public/public/_build/results?buildId=1416751&view=logs&j=20125c81-7edb-551b-693a-61efae016b74&t=7ce25265-aabe-59d3-d73c-06619cfcc3c4&l=80. My change restoring back the version turned out we still need it.
##[error].dotnet\sdk\10.0.107\Microsoft.Common.CurrentVersion.targets(2437,5): error MSB3277: (NETCORE_ENGINEERING_TELEMETRY=Build) Found conflicts between different versions of "Microsoft.Testing.Platform" that could not be resolved. There was a conflict between "Microsoft.Testing.Platform, Version=1.7.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" and "Microsoft.Testing.Platform, Version=1.8.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a". "Microsoft.Testing.Platform, Version=1.7.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" was chosen because it was primary and "Microsoft.Testing.Platform, Version=1.8.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" was not. References which depend on "Microsoft.Testing.Platform, Version=1.7.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" [D:\a\_work\1\s\.packages\microsoft.testing.platform\1.7.3\lib\netstandard2.0\Microsoft.Testing.Platform.dll].

  1. where does that change come from in dotnet/dotnet?

No idea where the change is from, especially the add to src/Shared/UnitTests/TestAssemblyInfo.cs

@JanProvaznik
Copy link
Copy Markdown
Member

@GangWang01 this kind of PR is generated based on merged changes in https://github.com/dotnet/dotnet/pulls?q=sort%3Aupdated-desc+is%3Apr+is%3Aopen

there should be a PR for it explaining the rationale. I am against reverting if we don't understand why it came to us.

@ViktorHofer
Copy link
Copy Markdown
Member

The change was made by @agocke here. He probably didn't realize that msbuild doesn't use latest Arcade which would explain the errors.

@GangWang01 GangWang01 force-pushed the darc-main-74c4ed9a-e19a-4b16-bd97-8838fedba456 branch from c5a4ae1 to 176af60 Compare May 13, 2026 02:18
@OvesN
Copy link
Copy Markdown
Contributor

OvesN commented May 13, 2026

We should revert the change causing the error

@dotnet-maestro dotnet-maestro Bot merged commit aa1e94a into main May 13, 2026
16 checks passed
@dotnet-maestro dotnet-maestro Bot deleted the darc-main-74c4ed9a-e19a-4b16-bd97-8838fedba456 branch May 13, 2026 13:31
@ViktorHofer
Copy link
Copy Markdown
Member

ViktorHofer commented May 13, 2026

That's not the way to go. Reverting this here will just introduce the error again on the VMR side. We need input from @agocke on how to best handle this in both worlds: VMR (arcade main) & msbuild (Arcade 10).

@ViktorHofer
Copy link
Copy Markdown
Member

dotnet/dotnet#6604 shows the failure now again due to the revert

@OvesN
Copy link
Copy Markdown
Contributor

OvesN commented May 14, 2026

dotnet/dotnet#6604 shows the failure now again due to the revert

@ViktorHofer
I do not know if @agocke will have time for this, so I will fix it in the VMR repo in this PR so it works for us and for VMR.

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.

4 participants