[automated] Merge branch 'release/10.0.3xx' => 'main'#53332
Conversation
…test modules as positional argument (#52449)
…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>
…test modules as positional argument (#53004)
…F, MAUI) (#53127) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ts but a child process of it remains alive (#53321)
…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
|
@MiYanni could you please help take a look at this issue? |
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? |
|
The code is generated inside this repo by tests, so I can fix it up. |
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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.