Skip to content

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

Merged
nagilson merged 834 commits intomainfrom
merge/release/10.0.3xx-to-main
Feb 12, 2026
Merged

[automated] Merge branch 'release/10.0.3xx' => 'main'#52711
nagilson merged 834 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
  • marcpopMSFT
  • jjonescz
  • jonathanpeppers
  • MiYanni
  • github-actions[bot]
  • DonnaChen888
  • SimonZhao888
  • dotnet-maestro[bot]
  • dotnet-bot
  • nagilson
  • Youssef1313
  • dsplaisted
  • invalid-email-address
  • Copilot
  • ellahathaway
  • joeloff
  • vseanreesermsft
  • dkurepa
  • mmitche
  • rainersigwald
  • JanProvaznik
  • baronfel

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.

dotnet-maestro bot and others added 30 commits December 3, 2025 02:02
…251202.3

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25571.1 -> To Version 2.1.0-preview.25602.3
MSTest From Version 4.1.0-preview.25571.1 -> To Version 4.1.0-preview.25602.3
…0251202.8

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 9.0.113-servicing.25562.8 -> To Version 9.0.113-servicing.25602.8
Microsoft.TemplateEngine.Abstractions From Version 9.0.113 -> To Version 9.0.113
…0251202.7

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.417-servicing.25602.4 -> To Version 8.0.417-servicing.25602.7
Microsoft.TemplateEngine.Abstractions From Version 8.0.417 -> To Version 8.0.417
…127.5

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.25562.4 -> To Version 9.0.0-beta.25577.5
…251203.1

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25575.3 -> To Version 2.1.0-preview.25603.1
MSTest From Version 4.1.0-preview.25575.3 -> To Version 4.1.0-preview.25603.1
…251203.1

On relative base path root
Microsoft.Testing.Platform From Version 2.1.0-preview.25571.1 -> To Version 2.1.0-preview.25603.1
MSTest From Version 4.1.0-preview.25571.1 -> To Version 4.1.0-preview.25603.1
…0251203.5

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309
Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25602.9 -> To Version 9.0.309-servicing.25603.5
…0251203.7

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309
Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25603.5 -> To Version 9.0.309-servicing.25603.7
@DonnaChen888
Copy link
Contributor

DonnaChen888 commented Feb 3, 2026

@MiYanni could you please help to take a look at this issue?

Testcase: Tests.GivenThatWeWantToFloatWarningLevels.It_has_globalconfig_for_latest_analysis_level
Error: Expected string to be "11.0" because AnalysisLevel=latest should map to the current TFM version (11.0). Update _LatestAnalysisLevel in Microsoft.NET.Sdk.Analyzers.targets., but "10.0" differs near "0.0" (index 1).

Comment on lines +25 to +26
<_LatestAnalysisLevel>10.0</_LatestAnalysisLevel>
<_PreviewAnalysisLevel>11.0</_PreviewAnalysisLevel>
Copy link
Member

Choose a reason for hiding this comment

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

@baronfel Given that main is now net11, should these be 11.0 and 12.0?

Copy link
Member

Choose a reason for hiding this comment

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

looks like there's a PR for this: #52468

…M, replace _testAssetsManager field with TestAssetsManager
@@ -0,0 +1,145 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Copy link
Member

Choose a reason for hiding this comment

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

this file should be removed, it is specific to 9.0 and earlier branches

@marcpopMSFT
Copy link
Member

@tmat Can you look at the failure in:
Microsoft.DotNet.Watch.UnitTests.ApplyDeltaTests.Microsoft.DotNet.Watch.UnitTests.ApplyDeltaTests.MauiBlazor

@dotnet/run-file Please look at:
Microsoft.DotNet.Cli.Run.Tests.RunFileTests.Microsoft.DotNet.Cli.Run.Tests.RunFileTests.CscArguments

@dotnet/dotnet-analyzers
Microsoft.NET.Build.Tests.GivenThatWeWantToFloatWarningLevels.Microsoft.NET.Build.Tests.GivenThatWeWantToFloatWarningLevels.It_defaults_preview_AnalysisLevel_to_the_next_tfm(currentTFM: "net11.0", nextTFMVersionNumber: "12.0")
Microsoft.NET.Build.Tests.GivenThatWeWantToFloatWarningLevels.Microsoft.NET.Build.Tests.GivenThatWeWantToFloatWarningLevels.It_has_globalconfig_for_latest_analysis_level

@nagilson
Copy link
Member

@baronfel FYI, I think the 1MB limit was too low:
image

@nagilson
Copy link
Member

[xUnit.net 00:01:22.51] Microsoft.NET.Sdk.BlazorWebAssembly.Tests.BlazorWasmStaticWebAssetsIntegrationTest.StaticWebAssets_BackCompatibilityPublish_Hosted_Works [FAIL] - the browser-wasm rid was not found for this test. @dotnet/aspnet-blazor-eng PTAL.

@lewing
Copy link
Member

lewing commented Feb 12, 2026

CI Failure Analysis: StaticWebAssets_BackCompatibilityPublish_Hosted_Works

Summary

The latest build (1290203) has a new failure in BlazorWasmStaticWebAssetsIntegrationTest.StaticWebAssets_BackCompatibilityPublish_Hosted_Works that was not present in the previous 4 builds. The Helix work item retried 3 times and all 3 retries failed with the same error, making a transient flake unlikely.

Error

Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets(650,5): error : The process cannot access the file
'...\blazorwasm\obj\Debug\net5\compress\Gts7tALu.gz' because it is being used by another process.

The error occurs in the _BlazorCompressPublishFiles target → GZipCompress task during the back-compat net5.0 publish path.

Build Progression Analysis

Build Date main SHA PR branch SHA Blazor Failure? Other Failures
1290203 Feb 11 316f9dd07af9 3cc90b014163 YES (3/3 retries)
1288443 Feb 10 a2421681138e c99b9a733bca No Build.Tests, dotnet.Tests
1286946 Feb 10 94db14b109cc bac59296bb8b No Build.Tests, dotnet.Tests, NetAnalyzers
1283494 Feb 6 494e1e412538 22c4f2f4cead No Build.Tests, dotnet.Tests, dotnet-watch
1282513 Feb 6 1998d6368898 f45ec8c215d9 No Build.Tests, dotnet.Tests, dotnet-watch

What changed between the passing and failing builds?

On main (a2421681138e316f9dd07af9): 5 commits — dotnet-watch fix, Static Web Assets docs (AGENTS.md only), testfx dependency updates, sdk-check crash fix. No code changes to BlazorWebAssembly targets or compression logic.

On the PR branch (c99b9a733bca3cc90b014163): 1 commit — 3cc90b01 "Apply copilot recommended test fixes" by @marcpopMSFT, which only modifies test/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs. Completely unrelated to Blazor.

Assessment

Neither the PR branch nor the main branch had any changes to Blazor WebAssembly targets, compression tasks, or static web asset publish paths. The failure is consistent (3/3 retries) but unexplained by code changes. This could be an environment-level change on the Helix test machines (e.g., VS 2026 Insiders MSBuild update affecting file locking behavior) or a latent race condition in the 5.0 back-compat GZipCompress task that is now being triggered more reliably.

@lewing
Copy link
Member

lewing commented Feb 12, 2026

[xUnit.net 00:01:22.51] Microsoft.NET.Sdk.BlazorWebAssembly.Tests.BlazorWasmStaticWebAssetsIntegrationTest.StaticWebAssets_BackCompatibilityPublish_Hosted_Works [FAIL] - the browser-wasm rid was not found for this test. @dotnet/aspnet-blazor-eng PTAL.

pretty sure that is a warning and not the cause of the failure?

@nagilson nagilson merged commit b48476e into main Feb 12, 2026
28 of 29 checks passed
@nagilson nagilson deleted the merge/release/10.0.3xx-to-main branch February 12, 2026 02:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.