Repository navigation
[main] Source code updates from dotnet/dotnet - #137371
dotnet-maestro[bot] wants to merge 4 commits into
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Azure Pipelines: 15 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Apply codeflow from dotnet/dotnet@f62df90 via `darc vmr resolve-conflict`. Resolve the eng/Subsets.props conflict by keeping the new ilasm.Tests project from runtime and applying the VMR's DotNetBuildSourceOnly exclusion to both ilasm test projects. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
ApiCompat 12.0.100-alpha.1.26561.101 is built against MSBuild that includes dotnet/msbuild#15431 (TaskLoggingHelper moved to Microsoft.Build.Framework), but SDK 12.0.100-alpha.1.26555.106 ships an older MSBuild, causing MissingMethodException for Task.get_Log(). Use the SDK from the same VMR build. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This reverts commit da6248c. The SDK should come from a VMR re-bootstrap flowing through codeflow, not a runtime-only global.json edit. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
|
We're blocked on another reboostrap now |
|
waiting for dotnet/dotnet#10928 |
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
new PR: #137416 |
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
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch