Skip to content

[release/10.0.3xx] Source code updates from dotnet/dotnet#53490

Closed
dotnet-maestro[bot] wants to merge 1 commit intorelease/10.0.3xxfrom
darc-release/10.0.3xx-306bda41-65a9-4ee3-a5f1-b34acc5ae578
Closed

[release/10.0.3xx] Source code updates from dotnet/dotnet#53490
dotnet-maestro[bot] wants to merge 1 commit intorelease/10.0.3xxfrom
darc-release/10.0.3xx-306bda41-65a9-4ee3-a5f1-b34acc5ae578

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

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

  • Removed 10.0.2
    • Microsoft.Extensions.DependencyInjection.Abstractions

Updated Dependencies

  • From 10.0.0-preview.26118.105 to 10.0.0-preview.26166.105
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.3.0-preview-26118-105 to 18.6.0-preview-26166-105
    • Microsoft.Build
    • Microsoft.Build.Localization
  • From 7.5.0-rc.11905 to 7.6.0-rc.16705
    • 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
  • From 10.0.300-alpha.26118.105 to 10.0.300-alpha.26166.105
    • Microsoft.Build.Tasks.Git
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab
  • From 5.5.0-2.26118.105 to 5.6.0-2.26166.105
    • 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
  • From 10.0.2 to 10.0.5
    • Microsoft.AspNetCore.App.Ref
    • 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.Web
    • Microsoft.AspNetCore.Components.WebAssembly
    • Microsoft.AspNetCore.Components.WebAssembly.Server
    • Microsoft.AspNetCore.Components.WebView
    • Microsoft.AspNetCore.Metadata
    • Microsoft.AspNetCore.TestHost
    • Microsoft.Bcl.AsyncInterfaces
    • Microsoft.DotNet.Web.ItemTemplates.10.0
    • Microsoft.DotNet.Web.ProjectTemplates.10.0
    • Microsoft.Extensions.Configuration.Ini
    • 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.ILLink.Tasks
    • Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64
    • Microsoft.NETCore.App.Ref
    • Microsoft.Win32.SystemEvents
    • 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
  • From 10.0.0-beta.26118.105 to 10.0.0-beta.26166.105
    • 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.XUnitExtensions
  • From 15.2.300-servicing.26118.105 to 15.2.300-servicing.26166.105
    • Microsoft.FSharp.Compiler
  • From 18.3.0-release-26118-105 to 18.3.0-release-26166-105
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 10.0.300-preview.26118.105 to 10.0.300-preview.26166.105
    • Microsoft.TemplateEngine.Abstractions
    • Microsoft.TemplateEngine.Authoring.TemplateVerifier
    • Microsoft.TemplateEngine.Edge
    • Microsoft.TemplateEngine.Mocks
    • Microsoft.TemplateEngine.Orchestrator.RunnableProjects
    • Microsoft.TemplateEngine.TestHelper
    • Microsoft.TemplateEngine.Utils
    • Microsoft.TemplateSearch.Common
    • Microsoft.TemplateSearch.TemplateDiscovery
  • From 10.0.2-servicing.25612.105 to 10.0.5-servicing.26153.111
    • dotnet-dev-certs
    • dotnet-user-jwts
    • dotnet-user-secrets
    • Microsoft.AspNetCore.Analyzers
    • Microsoft.AspNetCore.App.Ref.Internal
    • Microsoft.AspNetCore.Components.SdkAnalyzers
    • Microsoft.AspNetCore.DeveloperCertificates.XPlat
    • Microsoft.AspNetCore.Mvc.Analyzers
    • Microsoft.AspNetCore.Mvc.Api.Analyzers
    • Microsoft.Dotnet.WinForms.ProjectTemplates
    • Microsoft.NET.HostModel
    • Microsoft.NET.Sdk.WindowsDesktop
    • Microsoft.NETCore.Platforms
    • Microsoft.WindowsDesktop.App.Internal
  • From 3.2.2 to 3.2.5
    • Microsoft.Web.Xdt
  • From 2.0.2 to 2.0.5
    • System.CommandLine
  • From 2.2.2 to 2.2.5
    • Microsoft.DiaSymReader
  • From 2.0.0-preview.1.25612.105 to 2.0.0-preview.1.26153.111
    • Microsoft.Deployment.DotNet.Releases

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:8819f149301fd785421c01c271a50514d552b4a3..https://github.com/dotnet/sdk:darc-release/10.0.3xx-306bda41-65a9-4ee3-a5f1-b34acc5ae578

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 306373 of https://github.com/dotnet/dotnet/tree/8819f149301fd785421c01c271a50514d552b4a3.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/sdk
    cd sdk
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26161.2 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription 4514ea6b-c141-4e8c-8eb0-f7dc91caa781
    This should apply the build 306373 with sources from 8819f14
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id 4514ea6b-c141-4e8c-8eb0-f7dc91caa781
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id 4514ea6b-c141-4e8c-8eb0-f7dc91caa781 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@DonnaChen888
Copy link
Copy Markdown
Contributor

@MiYanni could you please help take a look at this issue?
A conflict was detected when trying to update this PR with changes from build 306373 of https://github.com/dotnet/dotnet/tree/8819f149301fd785421c01c271a50514d552b4a3.
The conflicts in the following files need to be manually resolved: source-build.slnf

@ViktorHofer ViktorHofer deleted the darc-release/10.0.3xx-306bda41-65a9-4ee3-a5f1-b34acc5ae578 branch March 18, 2026 07:32
@ViktorHofer
Copy link
Copy Markdown
Member

Here's the new one without conflicts: #53510

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants