Merge main into release/dnup (v2) by dsplaisted · Pull Request #54134 · dotnet/sdk

dsplaisted · 2026-04-28T21:49:18Z

Fresh merge of main into release/dnup, replacing #53868.

Conflict resolutions:

copilot-instructions.md: Kept ./.dotnet/\ prefix and added incremental-test skill note from main
github-merge-flow.jsonc: Adopted main's chain (1xx→3xx→4xx→main, dropping 2xx per dd4c984)
Interop.cs: Kept both hostfxr interop methods (main) and Unix realpath (release/dnup)
UnitTests.proj: Kept release/dnup's extra test excludes (dotnetup, AnalyzerRedirecting, TemplateEngine)

No version file conflicts — \global.json, \Version.Details.xml, and \Versions.props\ auto-merged cleanly.

…uild 20260318.1 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.26055.3 -> To Version 9.0.0-preview.26168.1

…uild 20260322.3 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.26055.3 -> To Version 9.0.0-preview.26172.3

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

…318.2 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26152.3 -> To Version 9.0.0-beta.26168.2

…330.1 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26152.3 -> To Version 9.0.0-beta.26180.1

…401.6 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26152.3 -> To Version 9.0.0-beta.26201.6

…ld 20260319.2 On relative base path root Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.26153.1 -> To Version 9.0.0-preview.26169.2

…ld 20260402.3 On relative base path root Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.26153.1 -> To Version 9.0.0-preview.26202.3

…0260407.6 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.313 -> To Version 9.0.314 Microsoft.TemplateEngine.Mocks From Version 9.0.313-servicing.26154.2 -> To Version 9.0.314-servicing.26207.6

…0260408.2 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.313 -> To Version 9.0.314 Microsoft.TemplateEngine.Mocks From Version 9.0.313-servicing.26154.2 -> To Version 9.0.314-servicing.26208.2

…0260408.8 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.313 -> To Version 9.0.314 Microsoft.TemplateEngine.Mocks From Version 9.0.313-servicing.26154.2 -> To Version 9.0.314-servicing.26208.8

Co-authored-by: Matt Thalman <mthalman@microsoft.com>

… merge/release/9.0.3xx-to-release/10.0.1xx

…0260409.3 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.313 -> To Version 9.0.314 Microsoft.TemplateEngine.Mocks From Version 9.0.313-servicing.26154.2 -> To Version 9.0.314-servicing.26209.3

The automated merge from release/10.0.2xx overwrote the 10.0.3xx version of the snapshot file. The two branches have legitimately different help output (10.0.2xx has --show-stderr/--show-stdout, 10.0.3xx has --artifacts-path instead). Restore the 10.0.3xx version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

The automated merge from release/10.0.2xx incorrectly overwrote dependency versions in Version.Details.props and Version.Details.xml. These files contain dependency versions managed by Maestro/darc and should not be updated by inter-branch merges — each branch has its own dependency flow. The merge downgraded ~60 package versions from 26203 builds to older 26201 builds and changed NuGet, Roslyn, and testing platform versions to incompatible values. Restore both files to match release/10.0.3xx. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…otnet#53524)

…net#53770)

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

…e/10.0.2xx

The "Using launch settings from ..." message was written to stdout via Reporter.Output.WriteLine, which pollutes program output and breaks piping (e.g. dotnet run > output.json produces invalid JSON). Changed to Reporter.Error.WriteLine in both RunCommand.cs and SolutionAndProjectUtility.cs so the message goes to stderr, consistent with other diagnostic messages. Updated tests to check StdErr for this message. Fixes dotnet#45640

…net#53542)

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

…tnet#53784)

… merge/release/9.0.3xx-to-release/10.0.1xx

…net#53801)

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

…l API (dotnet#53920) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com> Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…se/10.0.4xx-to-main

Replace production CLI and sdk-tasks Newtonsoft.Json usage with System.Text.Json APIs, including JsonNode-based DOM handling and source-generated serializer contexts for AOT/trimming-safe serialization. Enable AOT compatibility for sdk-tasks, remove direct Newtonsoft.Json package references from migrated projects, and add coverage for JSON mutation helpers, installer serialization, host data, aliases, and TemplateEngine CLI parsing parity.

Resolved conflicts: - copilot-instructions.md: kept .dotnet prefix and added incremental-test skill - github-merge-flow.jsonc: included full 10.0.1xx->2xx->3xx->4xx->main chain - Interop.cs: kept both hostfxr interop methods (main) and Unix realpath (dnup) - UnitTests.proj: kept dotnetup/AnalyzerRedirecting/TemplateEngine test excludes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Main explicitly removed release/10.0.2xx from the merge chain, changing it to 1xx->3xx->4xx->main. The 2xx entry in release/dnup was stale. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

github-actions · 2026-04-28T21:50:13Z

📋 SDK Diagnostic Documentation Reminder

This PR introduces 1 new SDK diagnostic code:

NETSDK1237

Action Required

Please ensure that documentation for this diagnostic is added or updated in the dotnet/docs repository at:

Path: docs/core/tools/sdk-errors/
Documentation: https://learn.microsoft.com/dotnet/core/tools/sdk-errors/

Each diagnostic should have:

A clear description of the error/warning
Possible causes
Recommended solutions
Code examples where applicable

Thank you for helping keep our documentation up to date! 🙏

…tnet#53947)" This reverts commit 1ec3763. The reverted change used @(ItemList) references in PropertyGroup conditions in Microsoft.NET.CrossGen.targets, which is not allowed by MSBuild (MSB4099). This breaks all builds that evaluate this file. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

These tests were missed in the original CppCli test disable (commit 60fabb7). Same root cause: VS 2026 scout Helix images missing VCTargetsPath/Microsoft.Cpp.Default.props. Fixes dotnet#54145 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…tnet#53947)" (dotnet#54135)

…se/dnup-v2

Instead of hardcoding --fx-version 8.0.0, dynamically find the actual installed 8.0.x runtime. With dotnetup, only the latest patch (e.g. 8.0.22) may be installed rather than 8.0.0. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

dsplaisted · 2026-04-30T00:42:40Z

/ba-g Infrastructure failures or other issues that haven't yet been fixed in main

DonnaChen888 and others added 30 commits April 9, 2026 15:06

[release/9.0.3xx] Update branding to 9.0.314 (dotnet#53740)

6634f7b

Reset files to release/10.0.1xx

6bcfed0

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

.NET Source-Build 9.0.115 March 2026 Updates (dotnet#53358)

6c29018

Co-authored-by: Matt Thalman <mthalman@microsoft.com>

Increase memory for license scanning (dotnet#53720)

f25b827

Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into…

66da2a2

… merge/release/9.0.3xx-to-release/10.0.1xx

Warn for missing shebang (dotnet#53614)

815727a

Fix dnx not authenticating for private feeds (dotnet#53322)

27547d7

[release/9.0.3xx] Update dependencies from dotnet/roslyn-analyzers (d…

c837e29

…otnet#53524)

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (dot…

5486d5c

…net#53770)

Reset files to release/10.0.2xx

8e5eedf

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…

7ec57f2

…e/10.0.2xx

[release/9.0.3xx] Update dependencies from dotnet/scenario-tests (dot…

0063a21

…net#53542)

Reset files to release/10.0.1xx

29ebb0e

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (do…

a401734

…tnet#53784)

Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into…

9499118

… merge/release/9.0.3xx-to-release/10.0.1xx

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (dot…

09d73d7

…net#53801)

github-actions Bot and others added 12 commits April 27, 2026 09:37

Reset files to main

3d9d02f

Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*

Merge branch 'main' into dev/simonrozsival/android-arm-coreclr

68abffb

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

5cbca6a

…se/10.0.4xx-to-main

CLI: Normalize bool option action invoking (dotnet#53872)

2d77a61

Add android-arm to CoreCLR runtime pack RIDs for .NET 11 (dotnet#54015)

4e4db23

RunFileTests: bring missing changes from 10.0.4xx (dotnet#54087)

65decd4

Add --strip-il-bodies crossgen2 arg for Apple mobile RIDs (dotnet#53947)

1ec3763

[automated] Merge branch 'release/10.0.4xx' => 'main' (dotnet#54088)

a2bd493

Fix merge-flow: drop 10.0.2xx per main's dd4c984

49334a0

Main explicitly removed release/10.0.2xx from the merge chain, changing it to 1xx->3xx->4xx->main. The 2xx entry in release/dnup was stale. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 28, 2026 21:49

Copilot AI reviewed Apr 28, 2026

View reviewed changes

github-actions Bot added the sdk-diagnostic-docs-needed Indicates that a PR introduces new diagnostic codes, which must be documented over at dotnet/docs label Apr 28, 2026

jjonescz and others added 4 commits April 29, 2026 06:44

Fix broken run-file test RefDirective_Duplicate

efc42a7

Revert "Add --strip-il-bodies crossgen2 arg for Apple mobile RIDs (do…

99750ed

…tnet#53947)" (dotnet#54135)

Merge remote-tracking branch 'upstream/main' into merge/main-to-relea…

0f30c21

…se/dnup-v2

nagilson approved these changes Apr 29, 2026

View reviewed changes

build-analysis Bot mentioned this pull request Apr 29, 2026

[Known Build Error] GivenAGetDependsOnNETStandardTask.SucceedsWithWarningOnLockedFile flaky failure #53870

Open

dsplaisted merged commit 135252a into dotnet:release/dnup Apr 30, 2026
23 of 29 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into release/dnup (v2)#54134

Merge main into release/dnup (v2)#54134
dsplaisted merged 433 commits intodotnet:release/dnupfrom
dsplaisted:merge/main-to-release/dnup-v2

dsplaisted commented Apr 28, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

github-actions Bot commented Apr 28, 2026 •

edited

Loading

Uh oh!

dsplaisted commented Apr 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

dsplaisted commented Apr 28, 2026

Conflict resolutions:

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📋 SDK Diagnostic Documentation Reminder

Action Required

Uh oh!

dsplaisted commented Apr 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

github-actions Bot commented Apr 28, 2026 •

edited

Loading