Skip to content

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

Merged
tmat merged 4 commits intorelease/10.0.3xxfrom
darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d
Feb 11, 2026
Merged

[release/10.0.3xx] Source code updates from dotnet/dotnet#52941
tmat merged 4 commits intorelease/10.0.3xxfrom
darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d

Conversation

@dotnet-maestro
Copy link
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

Updated Dependencies

  • From 10.0.0-preview.26076.108 to 10.0.0-preview.26103.116
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.3.0-preview-26076-108 to 18.3.0-preview-26103-116
    • Microsoft.Build
    • Microsoft.Build.Localization
  • From 7.3.0-preview.1.7708 to 7.4.0-rc.10416
    • 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.26076.108 to 10.0.300-alpha.26103.116
    • Microsoft.Build.Tasks.Git
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab
  • From 5.3.0-2.26076.108 to 5.5.0-2.26103.116
    • 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.0-beta.26076.108 to 10.0.0-beta.26103.116
    • 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.26076.108 to 15.2.300-servicing.26103.116
    • Microsoft.FSharp.Compiler
  • From 18.3.0-release-26076-108 to 18.3.0-release-26103-116
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 10.0.200-preview.26076.108 to 10.0.200-preview.26103.116
    • 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.1 to 10.0.2
    • 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.1-servicing.25569.105 to 10.0.2-servicing.25612.105
    • 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.NET.HostModel
    • Microsoft.NET.Sdk.WindowsDesktop
    • Microsoft.NETCore.Platforms
    • Microsoft.WindowsDesktop.App.Internal
  • From 3.2.1-servicing.25569.105 to 3.2.2
    • Microsoft.Web.Xdt
  • From 2.0.1 to 2.0.2
    • System.CommandLine
  • From 2.2.1-beta.25569.105 to 2.2.2
    • Microsoft.DiaSymReader
  • From 2.0.0-preview.1.25569.105 to 2.0.0-preview.1.25612.105
    • 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:9477b510bb25fc69515d2ab188af3b72799929ac..https://github.com/dotnet/sdk:darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d

@dotnet-maestro
Copy link
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 300237 of https://github.com/dotnet/dotnet/tree/9477b510bb25fc69515d2ab188af3b72799929ac.

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

  • src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/SharedOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/SharedOptionsFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/Microsoft.TemplateEngine.Cli/Commands/alias/BaseAliasAddCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/Microsoft.TemplateEngine.Cli/Commands/alias/BaseAliasShowCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/Microsoft.TemplateEngine.Cli/Commands/alias/LegacyAliasAddCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/Microsoft.TemplateEngine.Cli/Commands/alias/LegacyAliasShowCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Commands/Store/StoreCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Commands/Test/TestCommandDefinition.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Commands/Tool/Common/Store/StoreCommand.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Commands/Tool/Common/Store/StoreCommandDefinition.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ 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.26109.1 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 300237 with sources from 9477b51
  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
Contributor Author

Note

There was a conflict when merging version properties. In file eng/Version.Details.xml, property 'Microsoft.Dotnet.Wpf.ProjectTemplates'
was added in the target branch but removed in the source repo's branch.

We will prefer the change from the source branch and not add the property.

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

@dotnet-maestro
Copy link
Contributor Author

Caution

There was a conflict in Nuget.Config. Resolved by preferring the version from the repo. Please make sure to merge any necessary changes from the VMR's Nuget.Config if needed.

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

@nagilson
Copy link
Member

@dotnet/prodconsvcs I don't seem to have permissions to fix this VMR issue. May you PTAL?

darc vmr resolve-conflict --subscription 4514ea6b-c141-4e8c-8eb0-f7dc91caa781

info: Fetching PR branch darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d...
fail: The command terminated unsuccessfully.
      Failed to update D:\sdk from remote <redacted>
      Exit code: 1
      Std out:
      Fetching E1F74BB5AEE5F69C
      fatal: Authentication failed for 'https://github.com/dotnet/sdk/'
      error: could not fetch <redacted>

(note that darc authenticate seemed to work for other commands for me and gh auth login says I'm logged in already)

@mmitche
Copy link
Member

mmitche commented Feb 11, 2026

@marcpopMSFT @tmat FYI

@mmitche
Copy link
Member

mmitche commented Feb 11, 2026

@dotnet/prodconsvcs I don't seem to have permissions to fix this VMR issue. May you PTAL?

darc vmr resolve-conflict --subscription 4514ea6b-c141-4e8c-8eb0-f7dc91caa781

info: Fetching PR branch darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d...
fail: The command terminated unsuccessfully.
      Failed to update D:\sdk from remote <redacted>
      Exit code: 1
      Std out:
      Fetching E1F74BB5AEE5F69C
      fatal: Authentication failed for 'https://github.com/dotnet/sdk/'
      error: could not fetch <redacted>

(note that darc authenticate seemed to work for other commands for me and gh auth login says I'm logged in already)

Please try darc authenticate --clear

@tmat
Copy link
Member

tmat commented Feb 11, 2026

Looking

@tmat tmat requested review from a team as code owners February 11, 2026 19:44
@tmat tmat force-pushed the darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d branch from fc00bea to 695b078 Compare February 11, 2026 20:01
@tmat tmat enabled auto-merge (squash) February 11, 2026 22:50
@tmat tmat merged commit d07da7f into release/10.0.3xx Feb 11, 2026
34 of 35 checks passed
@tmat tmat deleted the darc-release/10.0.3xx-6d941cc9-8a8b-490d-89bf-611275c5b86d branch February 11, 2026 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants