Skip to content

Conversation

premun
Copy link
Member

@premun premun commented Sep 5, 2025

Backflow of build 282002

Unblocks problems that happened due to double-backflowing to main from 10.0.1xx and main VMR branches.

@Copilot Copilot AI review requested due to automatic review settings September 5, 2025 09:24
@premun premun requested review from a team as code owners September 5, 2025 09:24
Copy link
Contributor

github-actions bot commented Sep 5, 2025

This PR is targeting main, which is now for .NET 11-facing work. If you intended to target .NET 10, either retarget this PR to release/10.0.1xx or make sure you backport the change to release/10.0.1xx after merging. See #50394 for more details.

Copy link
Contributor

@Copilot Copilot AI left a 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
@premun
Copy link
Member Author

premun commented Sep 5, 2025

@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.

@SimonZhao888
Copy link
Member

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.

@premun
Copy link
Member Author

premun commented Sep 8, 2025

Thanks for checking. I think the V.D.xml is clashing with the latest merge of 10.0 into main.

However, V.D.xml and will keep conflicting if we keep backflowing to both main and 10.0 as each branch will receive some version of the VMR packages (one day one might be higher while the other it can be the opposite just solely depending on the fact of which commit will build first in the VMR).

# 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
@premun premun force-pushed the prvysoky/sdk-backflow branch from 7265afe to 2752957 Compare September 8, 2025 10:10
@premun
Copy link
Member Author

premun commented Sep 8, 2025

@SimonZhao888 I found out the code in main relies on some razor packages which are only changed in main. So we won't be able to merge any changes of Version.Details.xml from 10.0 to main (so the whole file should be omitted during the merges, not just the <Source> tag)

@premun
Copy link
Member Author

premun commented Sep 8, 2025

Suffers from similar problems as #50648

@SimonZhao888
Copy link
Member

@SimonZhao888 I found out the code in main relies on some razor packages which are only changed in main. So we won't be able to merge any changes of Version.Details.xml from 10.0 to main (so the whole file should be omitted during the merges, not just the <Source> tag)

Got it!

@mmitche
Copy link
Member

mmitche commented Sep 9, 2025

@marcpopMSFT This backflow should unblock things.

@premun
Copy link
Member Author

premun commented Sep 10, 2025

Closing in favour of dotnet/dotnet#2352

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants