[main] Source code updates from dotnet/dotnet - #133344
Merged
Merged
Conversation
Contributor
Author
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Contributor
Author
|
Azure Pipelines: 16 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
# Conflicts: # src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
Preserve SDK-selected shared-framework versions for hosted Blazor servers while using locally built packs for the current browser target framework. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e8e60636-6546-4220-ba80-6c8465d1cf99
ViktorHofer
approved these changes
Sep 8, 2026
Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.12.0-1.26456.103 -> 5.12.0-1.26458.102) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.DotNet.GenAPI.Task (Version 12.0.100-alpha.1.26456.103 -> 12.0.100-alpha.1.26458.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.FileCatalog, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.JobMonitor, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.26456.103 -> 11.0.0-beta.26458.102) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26456.103 -> 0.11.5-preview.26458.102) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26456.103 -> 2.9.3-beta.26458.102) Microsoft.NET.Runtime.Emscripten.Internal, Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 12.0.0-alpha.1.26456.103 -> 12.0.0-alpha.1.26458.102) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.12.0-rc.45703 -> 7.12.0-rc.45902) System.CommandLine (Version 4.0.0-alpha.1.26456.103 -> 4.0.0-alpha.1.26458.102) [[ commit created by automation ]]
akoeplinger
approved these changes
Sep 9, 2026
akoeplinger
deleted the
darc-main-73df62bc-bbf5-460f-a81c-a919ec410c67
branch
September 9, 2026 07:21
radekdoulik
added a commit
that referenced
this pull request
Sep 14, 2026
Fixes #133353. Use the SDK to acquire crossgen2 for CoreCLR wasm native relinking without enabling ReadyToRun. Preserve explicit and in-repo generator paths, and remove the obsolete crossgen2 workload declarations and `Sdk.props` shim. Request the pack before the first restore. When no pack is resolved, report the missing generator rather than an unrelated ReadyToRun error. Workload tests use their configured target framework and pack version. ## Validation Four build/publish regression cases passed. A standalone CoreCLR browser app outside the repository built and ran using repo-produced packages and native code passing a 24-byte struct by value. Validation used official VMR SDK `12.0.100-alpha.1.26458.102`, without an SDK code overlay, with the rebuilt native wasm SDK pack and existing repo-produced runtime packs. The required SDK support (dotnet/sdk#56119 and dotnet/sdk#55785) reached runtime through #133344. > [!NOTE] > This PR description was drafted with GitHub Copilot. --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: f6d6e5a4-5b25-4198-b42d-d5b2dc781f47
jtschuster
pushed a commit
to jtschuster/runtime
that referenced
this pull request
Sep 18, 2026
Fixes dotnet#133353. Use the SDK to acquire crossgen2 for CoreCLR wasm native relinking without enabling ReadyToRun. Preserve explicit and in-repo generator paths, and remove the obsolete crossgen2 workload declarations and `Sdk.props` shim. Request the pack before the first restore. When no pack is resolved, report the missing generator rather than an unrelated ReadyToRun error. Workload tests use their configured target framework and pack version. ## Validation Four build/publish regression cases passed. A standalone CoreCLR browser app outside the repository built and ran using repo-produced packages and native code passing a 24-byte struct by value. Validation used official VMR SDK `12.0.100-alpha.1.26458.102`, without an SDK code overlay, with the rebuilt native wasm SDK pack and existing repo-produced runtime packs. The required SDK support (dotnet/sdk#56119 and dotnet/sdk#55785) reached runtime through dotnet#133344. > [!NOTE] > This PR description was drafted with GitHub Copilot. --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: f6d6e5a4-5b25-4198-b42d-d5b2dc781f47
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