Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix backflow from VMR's main #50780

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 12 commits into from
Sep 19, 2025
Merged

Fix backflow from VMR's main #50780

merged 12 commits into from
Sep 19, 2025

Conversation

premun
Copy link
Member

@premun premun commented Sep 12, 2025

@premun premun requested a review from a team as a code owner September 12, 2025 12:23
@Copilot Copilot AI review requested due to automatic review settings September 12, 2025 12:23
@premun premun requested a review from a team as a code owner September 12, 2025 12:23
@github-actions GitHub Actions
Copy link
Contributor

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.

Copilot
Copilot AI reviewed Sep 12, 2025
View reviewed changes
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 changes from VMR's main branch, primarily updating dependency versions across the dotnet/sdk repository from rc.2 to rc.1 versions while maintaining compatibility. The changes include version updates, some code refactoring to remove nullable references, and improvements to build configurations.

Key changes include:

  • Updating dependency versions from 25427 build to 25461 build across multiple packages
  • Removing #nullable disable directives and updating property declarations
  • Refactoring Razor SDK serialization code for better type safety

Reviewed Changes

Copilot reviewed 17 out of 52 changed files in this pull request and generated 7 comments.

Show a summary per file
File Description
src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs Removes nullable annotations and refactors property declarations, updates runtime pack logic
src/RazorSdk/Tool/Json/*.cs Updates JSON serialization for TagHelper descriptors with improved type safety
src/Layout/redist/targets/*.targets Updates portable runtime identifier configurations and removes platform-specific conditions
global.json, eng/Version.Details.xml, eng/Version.Details.props Updates Arcade SDK and dependency package versions
src/Cli/dotnet/*.cs Updates command line action implementations
eng/common/. Updates source indexing and SBOM generation package versions

@premun
Copy link
Member Author

premun commented Sep 12, 2025

@marcpopMSFT @SimonZhao888 @mmitche @akoeplinger I still had to manually backflow as SDK is the place where the metadata was messed up (so the manual forward flow was not enough).

The changes here mostly come from this VMR commit: dotnet/dotnet@73c9eac

I expect this PR might suffer from similar problems like the 10.0.1xx one so

@build-analysis build-analysis bot mentioned this pull request Sep 12, 2025
Open
3 tasks
@marcpopMSFT
Copy link
Member

Lot of failures are C:\h\w\AA3B0949\p\d\sdk\10.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(119,5): error MSB4018: System.ArgumentNullException: Value cannot be null. (Parameter 'key')

I think we need baronfel's change that was in 10.0.1xx

@SimonZhao888
Copy link
Member

Here is baronfel's commit: Fix process framework references crash when null RID is passed

@premun
Copy link
Member Author

premun commented Sep 15, 2025 •
edited
Loading

@marcpopMSFT that change was already part of the branch here though as it merged into main

@build-analysis build-analysis bot mentioned this pull request Sep 15, 2025
Open
@marcpopMSFT marcpopMSFT force-pushed the prvysoky/backflow-main branch from 57b6a3a to f2bc305 Compare September 15, 2025 20:43
@marcpopMSFT
Copy link
Member

That change has flowed to main outside this PR now so rebasing and rerunning to see if that helps.

@premun
Copy link
Member Author

premun commented Sep 16, 2025

I merged main into the PR here before so probably not going to change much

@build-analysis build-analysis bot mentioned this pull request Sep 18, 2025
Open
@akoeplinger akoeplinger requested a review from a team as a code owner September 18, 2025 17:09
@premun
Copy link
Member Author

premun commented Sep 19, 2025

@marcpopMSFT we are green here, can we merge?

@premun premun changed the title Manually backflow VMR's main Fix backflow from VMR's main Sep 19, 2025
@akoeplinger
Copy link
Member

Let's merge so we can get the codeflow working again.

@akoeplinger akoeplinger merged commit e52eadb into dotnet:main Sep 19, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot Copilot left review comments

@akoeplinger akoeplinger akoeplinger approved these changes

+1 more reviewer

@KalleOlaviNiemitalo KalleOlaviNiemitalo KalleOlaviNiemitalo left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Area-Infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@premun @marcpopMSFT @SimonZhao888 @akoeplinger @KalleOlaviNiemitalo @dsplaisted