Skip to content

[automated] Merge branch 'release/10.0.3xx' => 'main'#53007

Merged
marcpopMSFT merged 530 commits intomainfrom
merge/release/10.0.3xx-to-main
Mar 5, 2026
Merged

[automated] Merge branch 'release/10.0.3xx' => 'main'#53007
marcpopMSFT merged 530 commits intomainfrom
merge/release/10.0.3xx-to-main

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/10.0.3xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/10.0.3xx by the following committers:

  • tmat
  • dotnet-maestro[bot]
  • marcpopMSFT
  • DonnaChen888
  • Copilot
  • nagilson
  • Youssef1313
  • lewing
  • github-actions[bot]
  • YuliiaKovalova
  • joeloff
  • jonathanpeppers
  • baronfel
  • dotnet-bot
  • dsplaisted
  • invalid-email-address
  • MiYanni
  • akoeplinger
  • mthalman
  • SimonZhao888
  • vseanreesermsft
  • dotnet-sb-bot
  • MichaelSimons
  • NikolaMilosavljevic

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/10.0.3xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.3xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.3xx-to-main
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.3xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.3xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/10.0.3xx-to-main origin/main
git pull https://github.com/dotnet/sdk merge/release/10.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.3xx-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.3xx-to-main origin/main
git pull git@github.com:dotnet/sdk merge/release/10.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.3xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

marcpopMSFT and others added 30 commits January 15, 2026 16:17
…merge/release/9.0.1xx-to-release/9.0.3xx
…0260115.3

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.310 -> To Version 9.0.311
Microsoft.TemplateEngine.Mocks From Version 9.0.310-servicing.26063.1 -> To Version 9.0.311-servicing.26065.3
…encies for all 2xx repos to the current version in dotnet/dotnet
…260116.2

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26066.2
MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26066.2
…260116.2

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26066.2
MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26066.2
…260117.2

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26067.2
MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26067.2
…260117.2

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26067.2
MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26067.2
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…260118.4

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26068.4
MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26068.4
…260118.4

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.26067.2 -> To Version 2.1.0-preview.26068.4
MSTest From Version 4.1.0-preview.26067.2 -> To Version 4.1.0-preview.26068.4
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
…0260119.1

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.311 -> To Version 9.0.311
Microsoft.TemplateEngine.Mocks From Version 9.0.311-servicing.26065.3 -> To Version 9.0.311-servicing.26069.1
Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
Co-authored-by: mariam-abdulla <mabdullah@microsoft.com>
Co-authored-by: Mariam Abdullah <122357303+mariam-abdulla@users.noreply.github.com>
Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com>
…19.1

On relative base path root
Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.26064.1 -> To Version 9.0.0-preview.26069.1
@DonnaChen888
Copy link
Contributor

@nagilson Could you please help to take a look at this issue?
src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs(5,48): error CS0234: (NETCORE_ENGINEERING_TELEMETRY=Build) The type or namespace name 'Extensions' does not exist in the namespace 'Microsoft.Extensions.DependencyInjection' (are you missing an assembly reference?)

@jonathanpeppers
Copy link
Member

I fixed the merge conflicts, to just try to help move this along.

@dsplaisted
Copy link
Member

@JeremyKuhne I fixed one thing here and now (locally at least) it's failing with some trimming compatibility errors. Could you take a look?

D:\git\dotnet-sdk-main\src\Cli\dotnet\SlnfFileHelper.cs(89,20): error IL2026: Using member 'System.Text.Json.JsonSerializer.Serialize(TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
D:\git\dotnet-sdk-main\src\Cli\dotnet\SlnfFileHelper.cs(89,20): error IL3050: Using member 'System.Text.Json.JsonSerializer.Serialize(TValue, JsonSerializerOptions)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation. Use System.Text.Json source generation for native AOT applications.
D:\git\dotnet-sdk-main\src\Cli\dotnet\SlnfFileHelper.cs(128,20): error IL2026: Using member 'System.Text.Json.JsonSerializer.Serialize(TValue, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
D:\git\dotnet-sdk-main\src\Cli\dotnet\SlnfFileHelper.cs(128,20): error IL3050: Using member 'System.Text.Json.JsonSerializer.Serialize(TValue, JsonSerializerOptions)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation. Use System.Text.Json source generation for native AOT applications.

marcpopMSFT and others added 3 commits March 4, 2026 17:00
- Replace JsonSerializer.Serialize<T>(T, JsonSerializerOptions) with source-generated
  SlnfJsonSerializerContext in SlnfFileHelper.cs to fix IL2026/IL3050 trim/AOT errors
- Replace _testAssetsManager with TestAssetsManager (base class property) in test files

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copy link
Member

@JeremyKuhne JeremyKuhne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Json fixes look good

@marcpopMSFT marcpopMSFT merged commit 32ad88a into main Mar 5, 2026
26 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/10.0.3xx-to-main branch March 5, 2026 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.