-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Manually backflow sources from dotnet/dotnet
#50657
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This PR is targeting |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR performs a manual backflow of sources from the dotnet/dotnet
VMR (Virtual Monorepo) repository to address issues caused by double-backflowing between the 10.0.1xx
and main
branches.
Key changes:
- Updates tool pack selection logic to better handle portable vs non-portable runtime identifiers
- Replaces Razor JSON serialization with a new custom implementation
- Updates various package versions and build configuration files
Reviewed Changes
Copilot reviewed 55 out of 57 changed files in this pull request and generated 5 comments.
Show a summary per file
File | Description |
---|---|
src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs | Enhanced tool pack selection logic for portable RIDs |
src/RazorSdk/Tool/ | Replaced old JSON converters with new custom implementation |
src/Layout/ | Updated template bundling and build configurations |
eng/ | Updated package versions and build tooling references |
global.json | Updated Arcade SDK versions |
# Conflicts: # eng/Version.Details.props # eng/Version.Details.xml # eng/common/core-templates/steps/generate-sbom.yml # eng/common/tools.ps1 # global.json # src/Cli/dotnet/Commands/CliCommandStrings.resx
@marcpopMSFT @SimonZhao888 I am trying to fix the backflow of VMR into SDK's main (there was a misconfiguration of subscriptions and build from 10.0 and main have backflown into main here). I see the changes done here also made in the VMR but let me know if this is not reverting something that the interbranch merging did before. |
I didn't find any reverting codes in this PR, except Version.Details.props and Version.Details.xml, it seems that the referenced package version has been downgraded. |
Thanks for checking. I think the V.D.xml is clashing with the latest merge of 10.0 into main. However, |
# Conflicts: # eng/Version.Details.props # eng/Version.Details.xml # eng/common/sdk-task.sh # global.json # src/RazorSdk/Tool/Json/JsonDataReader.cs # src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs # src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs # src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs
7265afe
to
2752957
Compare
@SimonZhao888 I found out the code in |
Suffers from similar problems as #50648 |
Got it! |
@marcpopMSFT This backflow should unblock things. |
Closing in favour of dotnet/dotnet#2352 |
Backflow of build 282002
Unblocks problems that happened due to double-backflowing to
main
from10.0.1xx
andmain
VMR branches.