[release/10.0.3xx] Source code updates from dotnet/dotnet#52941
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. |
|
Note There was a conflict when merging version properties. In file eng/Version.Details.xml, property 'Microsoft.Dotnet.Wpf.ProjectTemplates' We will prefer the change from the source branch and not add the property. 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution There was a conflict in Nuget.Config. Resolved by preferring the version from the repo. Please make sure to merge any necessary changes from the VMR's Nuget.Config if needed. 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
@dotnet/prodconsvcs I don't seem to have permissions to fix this VMR issue. May you PTAL? (note that darc authenticate seemed to work for other commands for me and gh auth login says I'm logged in already) |
|
@marcpopMSFT @tmat FYI |
Please try darc authenticate --clear |
|
Looking |
fc00bea to
695b078
Compare
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