Skip to content

[main] Source code updates from dotnet/dotnet#52885

Closed
dotnet-maestro[bot] wants to merge 0 commit intomainfrom
darc-main-105c8bc4-99e8-4d8c-81ca-f2c082a637a7
Closed

[main] Source code updates from dotnet/dotnet#52885
dotnet-maestro[bot] wants to merge 0 commit intomainfrom
darc-main-105c8bc4-99e8-4d8c-81ca-f2c082a637a7

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 6, 2026

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 11.0.0-preview.1.26069.105 to 11.0.0-preview.2.26103.111
    • dotnet-dev-certs
    • dotnet-user-jwts
    • dotnet-user-secrets
    • 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.Mvc.Api.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.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.HostModel
    • Microsoft.NET.ILLink.Tasks
    • Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64
    • 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
  • From 10.0.0-preview.26069.105 to 10.0.0-preview.26103.111
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.4.0-preview-26069-105 to 18.5.0-preview-26103-111
    • Microsoft.Build
    • Microsoft.Build.Localization
  • From 7.3.0-preview.1.7005 to 7.4.0-rc.10411
    • 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 11.0.100-preview.26069.105 to 11.0.100-preview.2.26103.111
    • Microsoft.Build.Tasks.Git
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab
  • From 5.4.0-2.26069.105 to 5.5.0-2.26103.111
    • 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 2.0.0-preview.1.26069.105 to 2.0.0-preview.1.26103.111
    • Microsoft.Deployment.DotNet.Releases
  • From 3.0.0-preview.26069.105 to 3.0.0-preview.2.26103.111
    • Microsoft.DiaSymReader
  • From 11.0.0-beta.26069.105 to 11.0.0-beta.26103.111
    • 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.100-preview.26069.105 to 15.2.100-preview2.26103.111
    • Microsoft.FSharp.Compiler
  • From 18.3.0-preview-26069-105 to 18.4.0-preview-26103-111
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 11.0.100-preview.1.26069.105 to 11.0.100-preview.2.26103.111
    • 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 3.3.0-preview.26069.105 to 3.3.0-preview.2.26103.111
    • Microsoft.Web.Xdt
  • From 3.0.0-preview.1.26069.105 to 3.0.0-preview.2.26103.111
    • System.CommandLine

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:3531114c7feabc86ea3769ca2c5b804e5339a932..https://github.com/dotnet/sdk:darc-main-105c8bc4-99e8-4d8c-81ca-f2c082a637a7

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Feb 6, 2026

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 300217 of https://github.com/dotnet/dotnet/tree/3531114c7feabc86ea3769ca2c5b804e5339a932.

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

  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.BundledVersions.props
    🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.props
    🔍 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.26102.3 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 resolve the conflict locally
    darc vmr resolve-conflict --subscription 94ba9a9b-a084-4c1e-bf44-d0c711c17773
    This should apply the build 300217 with sources from 3531114
  4. 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.

lewing added a commit to dotnet/runtime that referenced this pull request Feb 8, 2026
…ackflow (#124129)

## Version.Details.xml as primary VMR snapshot source + forward flow
scanning

### Problem
The codeflow status script relied on PR body metadata and commit
messages to determine the VMR snapshot. When manual backflow was used
(e.g., \darc vmr backflow\ pushed directly), the PR body was stale and
commit messages didn't follow the expected format, causing incorrect
freshness reporting.

### Changes

**Commit 1: VD.xml as primary snapshot**
- \�ng/Version.Details.xml\ (\<Source Sha=...>\) is now checked first as
the authoritative snapshot source
- XML parser with regex fallback, 40-char SHA validation
- Commit messages are secondary confirmation, PR body is last resort
- Case-insensitive SHA comparison throughout
- \2>\\\ for stderr isolation on all \gh\ calls

**Commit 2: Forward flow scanning in -CheckMissing**
- \-CheckMissing\ now scans open forward flow PRs (product repo →
dotnet/dotnet)
- Detects conflicts and staleness via Maestro comment scanning
- Combined summary showing backflow + forward flow health

### Testing
- VD.xml: Tested against sdk#52727 (manual backflow mismatch), sdk#52885
(conflicted), aspnetcore#65338 (deleted branch), runtime#124098
(normal), sourcelink#1581 (fresh)
- Forward flow: Tested against dotnet/sdk (4 PRs: 2 healthy, 1 stale, 1
conflict) and dotnet/runtime (3 PRs: 2 healthy, 1 stale)

Cross-repo context: dotnet/sdk#52727, dotnet/sdk#52885
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Feb 9, 2026

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 94ba9a9b-a084-4c1e-bf44-d0c711c17773
    
  • 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 94ba9a9b-a084-4c1e-bf44-d0c711c17773 --force
    

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

@nagilson nagilson enabled auto-merge February 10, 2026 18:35
@DonnaChen888
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

auto-merge was automatically disabled February 11, 2026 17:48

Pull request was closed

@marcpopMSFT marcpopMSFT force-pushed the darc-main-105c8bc4-99e8-4d8c-81ca-f2c082a637a7 branch from 287a165 to 2046dea Compare February 11, 2026 17:48
@marcpopMSFT
Copy link
Member

no changes, the flow must have been merged independently

@dotnet-maestro dotnet-maestro bot deleted the darc-main-105c8bc4-99e8-4d8c-81ca-f2c082a637a7 branch February 11, 2026 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants