[release/11.0.1xx-preview4] Source code updates from dotnet/arcade#6265
Closed
dotnet-maestro[bot] wants to merge 3 commits intorelease/11.0.1xx-preview4from
Closed
Conversation
Diff: https://github.com/dotnet/arcade/compare/a08169b890573cfd7f949ea9062c86a4db1aab1b..ea5fa1675a08347dde19aee855e04a21bd8586b4 From: dotnet/arcade@a08169b To: dotnet/arcade@ea5fa16 [[ commit created by automation ]]
[[ commit created by automation ]]
Contributor
Author
Port the fix from VMR main to avoid CS0433 'Assert exists in both xunit.assert and xunit.v3.assert.aot' build errors. The xunit.v3.assert.aot package conflicts with existing xunit v2 assert references. The replacement Microsoft.DotNet.XUnitAssert package is gated behind UseDotNetXUnitAssert opt-in to avoid the conflict. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jeffhandley
approved these changes
Apr 29, 2026
auto-merge was automatically disabled
April 30, 2026 18:17
Pull request was closed
dotnet-maestro
Bot
deleted the
darc-release/11.0.1xx-preview4-fff4ce4f-f95c-42f2-b12b-164a7bdf12f3
branch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
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/dotnet/arcade
Diff the source with this PR branch