[main] Source code updates from dotnet/dotnet#54292
Merged
dotnet-maestro[bot] merged 14 commits intoMay 18, 2026
Merged
Conversation
Diff: https://github.com/dotnet/dotnet/compare/ebbbb32f13fb8f53a8a34587c4c7dcb792adb8ea..547c640d5626b2976499cb3433abc741a63d67c5 From: dotnet/dotnet@ebbbb32 To: dotnet/dotnet@547c640 [[ commit created by automation ]]
Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.11.0, Microsoft.DotNet.Web.ProjectTemplates.11.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 11.0.0-preview.4.26208.110 -> 11.0.0-preview.5.26261.101) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.26208.110 -> 10.0.0-preview.26261.101) Microsoft.Build, Microsoft.Build.Localization (Version 18.6.0-preview-26208-110 -> 18.8.0-preview-26261-101) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.6.0-rc.20910 -> 7.7.0-rc.26201) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 11.0.100-preview.4.26208.110 -> 11.0.100-preview.5.26261.101) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.ExternalAccess.HotReload, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.7.0-1.26208.110 -> 5.7.0-1.26261.101) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.26208.110 -> 2.0.0-preview.1.26261.101) Microsoft.DiaSymReader, System.CommandLine (Version 3.0.0-preview.4.26208.110 -> 3.0.0-preview.5.26261.101) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitV3Extensions (Version 11.0.0-beta.26208.110 -> 11.0.0-beta.26261.101) Microsoft.FSharp.Compiler (Version 15.2.100-preview4.26208.110 -> 15.2.101-preview5.26261.101) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.7.0-preview-26208-110 -> 18.8.0-preview-26261-101) Microsoft.Web.Xdt (Version 3.3.0-preview.4.26208.110 -> 3.3.0-preview.5.26261.101) [[ commit created by automation ]]
PR #53733 moved test templates to test/TestAssets/TestPackages/TemplateEngine/. This codeflow re-introduces the old location from the VMR, which still has leftover files from when dotnet/templating was flowing in (now consolidated). The old-location files are unreferenced by sdk.slnx / TemplateEngine.slnf but get picked up by test/UnitTests.proj's `**\*.Tests.csproj` glob, causing NETSDK1138 (net7.0 EOL) and NU1008 (inline Version + CPM) on MyTestProject.Tests.csproj. Companion VMR cleanup: dotnet/dotnet#6594. Once that merges, future codeflow PRs won't re-introduce these files.
The codeflow backflow commit dropped Microsoft.Extensions.Logging.Abstractions from Microsoft.NET.Build.Containers.csproj (it''s transitively pulled in via Microsoft.Extensions.Logging and doesn''t need to be redistributed). Update the SanityTest_NET_Build_ContainersDependencies known list to match.
The codeflow brought in template changes that affect the output of `dotnet new` template-listing commands: - Added: blazor-wasm-servicedefaults, blazorwebworker - Removed: webworker (renamed to blazorwebworker) Update the .verified.txt baseline files for the affected tests on all three OS platforms: - DotnetNewCompleteTests.CanDoTabCompletion - DotnetNewListTests.BasicTest_WhenListCommandIsUsed - DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed
…lies The codeflow brought in AspNetCore changes that include the following Microsoft.Extensions.* abstraction assemblies in the published Blazor wasm output where they previously were not: - Microsoft.Extensions.Configuration.Abstractions - Microsoft.Extensions.DependencyInjection.Abstractions - Microsoft.Extensions.FileProviders.Abstractions - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Options - Microsoft.Extensions.Primitives Regenerated baselines via: dotnet exec Microsoft.NET.Sdk.BlazorWebAssembly.Tests.dll -trait "AspNetCore=BaselineTest" with environment variable ASPNETCORE_TEST_BASELINES=true.
dsplaisted
force-pushed
the
darc-main-c8466db6-3e97-4f35-82d5-2a74d8f947f6
branch
from
eb341f0 to
01a09f4
Compare
Member
|
FYI on the three test/baseline updates I've pushed (30fd74b, cf5bb77, 01a09f4): 30fd74b — Containers SanityTest (@dotnet/sdk-container-builds-maintainers) cf5bb77 — dotnet-new verified baselines (@dotnet/templating-engine-maintainers)
Updated baselines for three tests on all three OS platforms:
01a09f4 — Blazor StaticWebAssets baselines (@dotnet/aspnet-blazor-eng) |
Contributor
Author
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
This was referenced May 14, 2026
When tests run in Helix, every test that uses ExecuteCommand/CreateBuildCommand writes a relative-path binlog (e.g. `msbuild0.binlog`) to its per-test working directory. The upload step in TestCommand.Execute() copies those binlogs to HELIX_WORKITEM_UPLOAD_ROOT using only Path.GetFileName, so multiple tests in the same Helix work item all collide on the same upload name and overwrite each other; only the last test's binlog actually gets uploaded. Prefix the destination filename with the last two segments of the test's working directory (typically `<TestInstance>---<GUID>-<ProjectDir>`) so each test's binlog lands at a unique upload path and we can correlate failures with their binlogs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Open
3 tasks
Member
|
@dotnet/aspnet-blazor-eng @lewing @maraf — There are some Blazor tests failing here because the Mono runtime pack assets are being copied directly to the output folder, not the You can find a binlog from one of the tests here for investigation: net11 binlog ( Is this change intentional? Do Blazor apps still work without these files? |
…BuildPath on shared singleton Background: ToolsetInfo is a process-wide singleton accessed by all xUnit tests. InitSdkVersion runs `dotnet --version` to discover the SDK version, and to avoid recursing back into itself via AddTestEnvironmentVariables -> SdkVersion, it temporarily nulls FullFrameworkMSBuildPath on the singleton while the subprocess runs. When tests run in parallel (which the new TestPlatform/xUnit-v3 dispatch is more aggressive about than the previous version), another test thread that hits ToolsetInfo.CreateCommand during that window reads the transient null, treats ShouldUseFullFrameworkMSBuild as false, and silently invokes `dotnet msbuild` (Core MSBuild) instead of the desktop MSBuild that the FullFramework test leg requested. Observed regression: `GivenThatWeWantToBuildWithGlobalJson.It_fails_build_on_failed_sdk_resolution(runningInVS: True)` fails on the FullFramework leg because the Microsoft.DotNet.MSBuildSdkResolver (loaded via MSBUILDADDITIONALSDKRESOLVERSFOLDER_NETFRAMEWORK, which Core MSBuild doesn't read) is not loaded, so the expected `warning : Unable to locate the .NET SDK` is never emitted. Confirmed against the latest PR build (Core MSBuild 18.8.0-preview-26261-101 + MSBuildRuntimeType=Core) vs. recent main build 1417464 (Desktop MSBuild 18.6.1 + MSBuildRuntimeType=Full). Fix: replace the mutation of the shared FullFrameworkMSBuildPath with a [ThreadStatic] suppression flag. InitSdkVersion sets the flag for its own thread (preserving the recursion break for its DotnetCommand subprocess) but no longer perturbs the property other test threads observe. A private EffectiveFullFrameworkMSBuildPath helper returns null when the per-thread flag is set, otherwise the real value; CreateCommand and AddTestEnvironmentVariables now consult Effective* so the suppress thread breaks recursion as before while parallel test threads continue to see the real desktop MSBuild path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… to 13.0.4 The Newtonsoft.Json package version was bumped from 13.0.3 to 13.0.4 in eng/Versions.props (commit 1599541, "Update Newtonsoft.Json to 13.0.4 to fix NU1109"). The corresponding test template still hardcoded 13.0.3, causing three tests to fail: - PostActionTests.AddPackageReference_Basic - PostActionTests.AddPackageReference_Basic_Approval - PostActionTests.ItCanCreateTemplate_WithAddPackageReference The first two tests assert via HaveStdOutContaining($"Adding a package reference Newtonsoft.Json (version: {ToolsetInfo.GetNewtonsoftJsonPackageVersion()})"), which expects the SDK-side version (13.0.4) but gets the template's hardcoded 13.0.3 in the CLI output. The Approval variant additionally relies on a regex scrubber anchored on the same "(version: <SDK Newtonsoft version>)" text, so the callback output isn't scrubbed when the versions mismatch. Bump the hardcoded version in both templates (Basic and BasicWithFiles) and update the three verified.txt files (Windows/Linux/OSX). This mirrors the precedent from commit b1dd035 (dotnet/templating@d845c2d8, Sep 2023), which made the equivalent 13.0.1 -> 13.0.3 update when eng/Versions.props was bumped earlier. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
3 tasks
Contributor
Author
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Member
Yes, the binlog looks correct. We read the wasm files from obj folder for build. I'll run baseline generator.. |
Contributor
Author
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Contributor
Author
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Contributor
Author
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
… 13.0.4 The previous commit (071fdbb) bumped the TemplateEngine variants of the AddPackageReference test templates to 13.0.4 but missed the dotnet-new variants under test/TestAssets/TestPackages/dotnet-new/test_templates/, which are the ones actually consumed by the failing dotnet-new.IntegrationTests: - PostActionTests.AddPackageReference_Basic - PostActionTests.AddPackageReference_Basic_Approval - PostActionTests.ItCanCreateTemplate_WithAddPackageReference These tests assert via HaveStdOutContaining(\$"Adding a package reference Newtonsoft.Json (version: {ToolsetInfo.GetNewtonsoftJsonPackageVersion()})"), which expects the SDK-side 13.0.4 but received the template's hardcoded 13.0.3. The Approval variant additionally has a ScrubByRegex anchored on the same "(version: <SDK Newtonsoft version>)" text, so the NuGet callback output (including the two new `X.509 certificate chain validation will use the fallback certificate bundle` info lines from NuGet 7.7) goes unscrubbed when the versions mismatch. Bump the three dotnet-new template.json files to match. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…iss rude-edit prompt SourceFileUpdateTests.RenameSourceFile(useMove: False) intermittently hangs on Windows for 60 minutes (until the hang collector fires). Roslyn's EnC analyzer classifies the delete-of-Foo.cs + add-of-Renamed.cs (same class content) as a rude edit (ENC0033 `Deleting class 'Lib' requires restarting the application'') some of the time -- whether it does depends on file-watcher event timing (whether the delete and add events arrive close enough for Roslyn to coalesce them into a rename vs. seeing two separate edits). When the rude edit fires, dotnet-watch displays an interactive restart prompt because the test launches `dotnet watch -bl'' without --non-interactive, without DOTNET_WATCH_RESTART_ON_RUDE_EDIT, and without TestFlags.ReadKeyFromStdin. The prompt's RestartPrompt.WaitForRestartConfirmationAsync blocks reading stdin, the test process keeps printing `> Foo.cs'' forever, and AssertOutputLineStartsWith `> Renamed.cs'' times out. Observed twice on PR #54292: - Build 1423147: TestBuild win-x64, dotnet-watch.Tests.dll.11 - Build 1424609: FullFramework win-x64, dotnet-watch.Tests.dll.6 (Each run hits at most one of the two Windows legs because the test shards differently between TestBuild and FullFramework.) Fix: opt into TestFlags.ReadKeyFromStdin and send 'a' (always restart) after the rename. This matches the pattern used by AutoRestartTests, BrowserTests, AspireHotReloadTests, MauiHotReloadTests, etc., and unblocks the test whether Roslyn classifies the change as a rude edit or not. The underlying inconsistency in Roslyn's EnC classification is worth a separate investigation by @dotnet/roslyn-ide, but is not addressed here. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
dotnet-maestro
Bot
deleted the
darc-main-c8466db6-3e97-4f35-82d5-2a74d8f947f6
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch