[automated] Merge branch 'release/10.0.3xx' => 'main'#53007
[automated] Merge branch 'release/10.0.3xx' => 'main'#53007marcpopMSFT merged 530 commits intomainfrom
Conversation
…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/*
…6e0-4223-bd6e-33ffe399be49
…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
…se/10.0.3xx-to-main
|
@nagilson Could you please help to take a look at this issue? |
|
I fixed the merge conflicts, to just try to help move this along. |
|
@JeremyKuhne I fixed one thing here and now (locally at least) it's failing with some trimming compatibility errors. Could you take a look?
|
- 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>
…se/10.0.3xx-to-main
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.