[main] Source code updates from dotnet/dotnet - #133344
Conversation
|
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. |
|
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
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 ]]
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