Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Update branding to .NET 11 - #2271

#2271
Merged
ViktorHofer merged 39 commits into
dotnet:maindotnet/dotnet:mainfrom
mmitche:net11-brandingmmitche/dotnet:net11-brandingCopy head branch name to clipboard
Dec 4, 2025
Merged

Update branding to .NET 11#2271
ViktorHofer merged 39 commits into
dotnet:maindotnet/dotnet:mainfrom
mmitche:net11-brandingmmitche/dotnet:net11-brandingCopy head branch name to clipboard

Conversation

@mmitche

@mmitche mmitche commented Sep 5, 2025

Copy link
Copy Markdown
Member

Notes on update:

  • Need to update some Version.Details.xml files as well as corresponding Version.Details.props

Comment thread src/sdk/eng/Versions.props Outdated
Comment thread src/command-line-api/eng/Versions.props
@mmitche

mmitche commented Sep 5, 2025

Copy link
Copy Markdown
Member Author

APICompat in the runtime build is unhappy about the version update, so more work to do for sure

@ViktorHofer

ViktorHofer commented Sep 5, 2025

Copy link
Copy Markdown
Member

Yes, phase 1 needs to pin the assembly version in runtime. See dotnet/runtime#118583. Sending a commit into this branch.

@mmitche

mmitche commented Sep 9, 2025

Copy link
Copy Markdown
Member Author

This PR will need additional attention. The packages created after updating to net11 change their names, so lots of updates are required in V.D.xml

@wtgodbe

wtgodbe commented Sep 9, 2025

Copy link
Copy Markdown
Member

There are a couple extra changes required in aspnetcore (the changes to ApiExplorerTest.cs and TemplatePackageInstaller.cs from https://github.com/dotnet/aspnetcore/pull/57340/files, but updated for 11). If you want I can push to your branch

@mmitche

mmitche commented Oct 2, 2025

Copy link
Copy Markdown
Member Author

10.0.0 PackageOverride.txt missing:

  D:\a\_work\1\s\src\sdk\src\Layout\redist\targets\GeneratePackagePruneData.targets(50,5): error MSB3030: Could not copy the file "D:\a\_work\1\s\src\sdk\artifacts\.packages\microsoft.netcore.app.ref\10.0.0\data\PackageOverrides.txt" because it was not found. [D:\a\_work\1\s\src\sdk\src\Layout\redist\redist.csproj]
##[error]src\sdk\src\Layout\redist\targets\GeneratePackagePruneData.targets(50,5): error MSB3030: (NETCORE_ENGINEERING_TELEMETRY=Build) Could not copy the file "D:\a\_work\1\s\src\sdk\artifacts\.packages\microsoft.netcore.app.ref\10.0.0\data\PackageOverrides.txt" because it was not found.
    dotnet-outputsframeworkversion-netcoreapp1.0 -> D:\a\_work\1\s\src\sdk\test\TestAssets\TestPackages\dotnet-outputsframeworkversion\dotnet-outputsframeworkversion-netcoreapp1.0\bin\Release\netcoreapp1.0\dotnet-outputsframeworkversion-netcoreapp1.0.dll

Copilot AI review requested due to automatic review settings October 23, 2025 14:38
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team October 23, 2025 14:39
@ViktorHofer

ViktorHofer commented Nov 20, 2025

Copy link
Copy Markdown
Member

@dsplaisted as this blocking the .NET 11 re-branding effort, can you please take a look and work on this in sdk?

I think we could move all the existing data (currently .cs files) to a PackagePruneData folder in redist.csproj as .json/.txt which would then get copied to the sdk output directory folder during the build.

When we rebrand and are missing data files for the N-1 TFM (i.e. net10.0 in this case), we would get an error and then include that data in the checked-in files. This would be manual by invoking a target that does that for us. Does that make sense? I didn't see anything in the existing .cs files that would prevent moving them into static data files.

@dsplaisted

Copy link
Copy Markdown
Member

@ViktorHofer @mmitche I've created a PR in the SDK which creates a process for checking in the prune package data: dotnet/sdk#51992

@mmitche

mmitche commented Dec 3, 2025

Copy link
Copy Markdown
Member Author

@dsplaisted That change will require that #3123 go in. May just want to make the change here.

@dsplaisted

Copy link
Copy Markdown
Member

@mmitche Is there a process to "cherry-pick" changes from a repo into the VMR? Or is it just to manually apply the changes?

@dsplaisted

Copy link
Copy Markdown
Member

Ugh, I accidentally clicked the close button on this, and that caused a bot to move it to Done on some board.

@am11

am11 commented Dec 3, 2025

Copy link
Copy Markdown
Member

@dsplaisted, we can apply upstream PR patches with:

$ curl -sSL https://github.com/dotnet/sdk/pull/51992.diff | git apply --directory=src/sdk -

@mmitche

mmitche commented Dec 3, 2025

Copy link
Copy Markdown
Member Author

@mmitche Is there a process to "cherry-pick" changes from a repo into the VMR? Or is it just to manually apply the changes?

darc vmr cherry-pick :)

Cherrypicked commits 8bb9aac61e53a495eae43b6789acc2aa4fbd5ea4 and efa4308f6a29f7dc41de6747109c30babb991e1c from dotnet/sdk#51992
@dsplaisted

Copy link
Copy Markdown
Member

I've cherry-picked the changes from dotnet/sdk#51992 into this PR and added the prune package data.

It required a little bit of hacking since I didn't want to try to build the full VMR locally, just the SDK repo. I hardcoded the MaxNetVersion to 11 in GeneratePackagePruneData.targets, and I had to disable some template packaging which was failing.

@ViktorHofer

Copy link
Copy Markdown
Member

scenario-tests grrrrr

@ViktorHofer

ViktorHofer commented Dec 4, 2025

Copy link
Copy Markdown
Member

D:\a_work\1\s\artifacts\obj\extracted-dotnet-sdk\sdk\11.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(66,5): error NETSDK1226: Prune Package data not found .NETCoreApp 10.0 Microsoft.AspNetCore.App. To ignore this error, set the AllowMissingPrunePackageData to true. [D:\a_work\1\s\src\scenario-tests\artifacts\obj\generatedtests\SdkTemplateTest_Mvc_CSharp\SdkTemplateTest_Mvc_CSharp.csproj] [D:\a_work\1\s\src\scenario-tests\src\Microsoft.DotNet.ScenarioTests.SdkTemplateTests\Microsoft.DotNet.ScenarioTests.SdkTemplateTests.csproj] [D:\a_work\1\s\repo-projects\scenario-tests.proj]

Looks like the aspnetcore net10.0 pruning data isn't there or can't be resolved.

image

It is there though:

image

@ViktorHofer

Copy link
Copy Markdown
Member

Looks like this hardcode is wrong: https://github.com/dotnet/sdk/blob/0d31ba892465268a030b3563df0bddef39855f6e/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs#L247

@ViktorHofer
ViktorHofer merged commit 0d3f40a into dotnet:main Dec 4, 2025
9 of 11 checks passed
@dsplaisted

Copy link
Copy Markdown
Member

🎉

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

10 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.