Skip to content

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

Merged
MiYanni merged 39 commits intomainfrom
merge/release/10.0.3xx-to-main
Mar 11, 2026
Merged

[automated] Merge branch 'release/10.0.3xx' => 'main'#53332
MiYanni merged 39 commits intomainfrom
merge/release/10.0.3xx-to-main

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Mar 9, 2026

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:

  • jjonescz
  • DonnaChen888
  • dotnet-bot
  • Youssef1313
  • invalid-email-address
  • jonathanpeppers
  • marcpopMSFT
  • Evangelink
  • Copilot
  • github-actions[bot]
  • dotnet-maestro[bot]

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.

Youssef1313 and others added 30 commits February 12, 2026 12:15
…260226.1

On relative base path root
Microsoft.Testing.Platform From Version 2.2.0-preview.26125.2 -> To Version 2.2.0-preview.26126.1
MSTest From Version 4.2.0-preview.26125.2 -> To Version 4.2.0-preview.26126.1
…260227.1

On relative base path root
Microsoft.Testing.Platform From Version 2.2.0-preview.26125.2 -> To Version 2.2.0-preview.26127.1
MSTest From Version 4.2.0-preview.26125.2 -> To Version 4.2.0-preview.26127.1
…260302.5

On relative base path root
Microsoft.Testing.Platform From Version 2.2.0-preview.26127.1 -> To Version 2.2.0-preview.26152.5
MSTest From Version 4.2.0-preview.26127.1 -> To Version 4.2.0-preview.26152.5
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
… in optimized CSC-only file-based app builds (#53205)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com>
…52802)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com>
Co-authored-by: Jan Jones <janjones@microsoft.com>
Co-authored-by: Rikki Gibson <rigibson@microsoft.com>
…F, MAUI) (#53127)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
dotnet-bot and others added 5 commits March 8, 2026 04:00
…path (#53086)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@github-actions github-actions bot requested review from a team and tmat as code owners March 9, 2026 15:41
…x-to-main

   - ProcessReaper.cs — Kept main's refactored subclass architecture, ported EnableWindowsCtrlCHandling() into
  WindowsProcessReaper
   - CSharpCompilerCommand.cs — Used main's ComputeRuntimeVersion() (handles TFM mismatch), kept HEAD's extracted
  helper methods, added TargetFramework property
   - CSharpCompilerCommand.Generated.cs — Kept HEAD's dynamic GetFrameworkReferenceArguments(), merged analyzerconfig
  paths from both sides
   - ValidationUtility.cs — Took main's static modifier
   - CliCommandStrings.resx + 13 XLF files — Kept both sets of new entries (ProjectConvert* from release,
  ProjectManifest* from main)
   - 2 test files — Used main's TestAssetsManager property
@DonnaChen888
Copy link
Contributor

@MiYanni could you please help take a look at this issue?
src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs(73,14): error IL2026: (NETCORE_ENGINEERING_TELEMETRY=Build) 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.

@MiYanni
Copy link
Member

MiYanni commented Mar 10, 2026

@MiYanni could you please help take a look at this issue? src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs(73,14): error IL2026: (NETCORE_ENGINEERING_TELEMETRY=Build) 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.

Serialize/Deserialize can no longer be used without code generating the type. There's examples of this here: #52865

The issue is, this is in generated code. So, we cannot directly edit it. @jjonescz Any ideas?

@jjonescz
Copy link
Member

The code is generated inside this repo by tests, so I can fix it up.

@MiYanni MiYanni merged commit f3f14ed into main Mar 11, 2026
27 checks passed
@MiYanni MiYanni deleted the merge/release/10.0.3xx-to-main branch March 11, 2026 21: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.

9 participants