Repository navigation
[main] Source code updates from dotnet/dotnet - #55765
Closed
dotnet-maestro[bot] wants to merge 4 commits into
Closed
dotnet-maestro[bot] wants to merge 4 commits into
dotnet-maestro[bot] wants to merge 4 commits into
Conversation
Updated Dependencies: 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.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.McpServer.ProjectTemplates.11.0, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, 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-rc.1.26410.101 -> 11.0.0-rc.1.26411.119) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 11.1.0-preview.26410.101 -> 11.1.0-preview.26411.119) Microsoft.Build, Microsoft.Build.Localization, Microsoft.Build.TaskAuthoring.Analyzer (Version 18.11.0-1.26410.101 -> 18.11.0-1.26411.119) 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.11.0-rc.41101 -> 7.11.0-rc.65534) 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-rc.1.26410.101 -> 11.0.100-rc.1.26411.119) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, 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.11.0-1.26410.101 -> 5.11.0-1.26411.119) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.26410.101 -> 2.0.0-preview.1.26411.119) Microsoft.DiaSymReader, System.CommandLine (Version 3.0.0-rc.1.26410.101 -> 3.0.0-rc.1.26411.119) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.JobMonitor, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitV3Extensions (Version 11.0.0-beta.26410.101 -> 11.0.0-beta.26411.119) Microsoft.FSharp.Compiler (Version 15.2.101-rc1.26410.101 -> 15.2.101-rc1.26411.119) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.11.0-preview-26410-101 -> 18.11.0-preview-26411-119) Microsoft.Web.Xdt (Version 3.3.0-rc.1.26410.101 -> 3.3.0-rc.1.26411.119) Added Dependencies: Microsoft.NET.Runtime.Emscripten.Internal (Version 11.0.0-rc.1.26411.119) Removed Dependencies: Microsoft.NET.Runtime.Emscripten.5.0.6.Cache.win-x64 (Version 11.0.0-preview.7.26360.111) [[ commit created by automation ]]
Contributor
Author
|
Note VMR PRs included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Resolve dependency metadata conflicts by retaining the codeflow updates while preserving main's newer Helix JobMonitor dependency. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d5b5ac40-0f74-4e4a-9f96-9b79a7c79604
Member
|
@dotnet/razor-tooling @chsienki There are failing Razor tests here, apparently related to the sonic work: dotnet/roslyn#84778 What needs to be done to fix or unblock this? |
Member
|
I'll push up a fix to this pr, thanks for the heads-up |
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. |
Resolve TestFX dependency metadata in favor of the newer versions already on main, keeping Version.Details.props, Version.Details.xml, and global.json coherent. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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. |
chsienki
added a commit
to dotnet/roslyn
that referenced
this pull request
Aug 27, 2026
## Summary The Sonic unrevert made the Razor decl/impl markup split unconditional: `DefaultRazorMarkupSplitPhase` ran for every `RazorProjectEngine`, but the only public accessor (`RazorCodeDocumentExtensions.GetCSharpDocument()`) is hard-wired to the impl half. A host that consumes only the implementation document — notably the SDK's classic, non-source-generator Razor compilation — therefore silently lost everything the split moved into the decl half. This gates the split behind an opt-in option, so classic mode again produces a single complete document. ## Changes - **`RazorCodeGenerationOptions`** — new internal `EnableMarkupSplit` flag (`Flags.EnableMarkupSplit = 1 << 13`), option property, and `Builder` property, defaulting to off. No public API change, so no `PublicAPI.Unshipped.txt` churn. - **`DefaultRazorMarkupSplitPhase`** — returns the document untouched when the flag is clear, the same early-out it already takes for non-components. `DefaultRazorDeclCSharpLoweringPhase` then no-ops (no decl subtree stashed) and `DefaultRazorCSharpLoweringPhase` writes the whole document as a single file. Both phases stay registered, so the public phase list and `RazorProjectEngineTest`'s ordering assertion are unchanged, and nothing downstream needed to change. - **Source generator** — `RazorSourceGenerator.Helpers.GetProjectEngine` opts in (it emits both `.g.cs` and `.decl.g.cs`). The separate declaration/discovery engine stays off. - **Test infrastructure** — opts in so existing split/baseline assertions are unchanged: `RazorIntegrationTestBase` (via a new overridable `internal virtual bool EnableMarkupSplit => true`), `IntegrationTestBase`, `RazorProjectEngineTestBase`, `RazorToolingIntegrationTestBase`, `RazorToolingProjectEngineTestBase`, `RazorCodeDocumentFactory`. - **New `MarkupSplitterDisabledComponentTest`** — overrides `EnableMarkupSplit => false` and asserts a splittable component yields a null decl document and a single impl document carrying both the markup-free member and the lifted markup method, and that it still compiles. ### Why an option rather than conditional phase registration The phase list is public (`RazorProjectEngine.Phases`) and asserted on in tests; conditional registration would also have to be threaded through the `RazorProjectEngine.Create` overloads and `ProcessDeclarationOnly`, and would make the presence of a pipeline stage configuration-dependent. The option flag gets the same effect with the pipeline shape unchanged, which is the lower-risk answer to "will downstream steps expect the phase to have run?". ## Validation - `dotnet build src/Razor/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj` — 0 warnings, 0 errors - `dotnet build Razor.slnf` — 0 errors - `dotnet test --framework net10.0`: Razor Language 3976 passed, SourceGenerators 220 passed, Razor.Workspaces 391 passed, Remote.Razor 488 passed, VSCode RazorExtension (includes CohostingShared) 1525 passed. No baselines changed. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/85040) Fixes dotnet/sdk#55765 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com>
chsienki
had a problem deploying
to
copilot-pat-pool
August 27, 2026 19:32 — with 
GitHub Actions
Failure
GitHub Actions
Failure
dotnet-maestro
Bot
deleted the
darc-main-6522228f-109d-424c-a506-fc46df8104dd
branch
August 27, 2026 19:36
This branch had an error being deployed
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
2 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
New Dependencies
Removed Dependencies
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch