Skip to content

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

Open
dotnet-maestro[bot] wants to merge 1 commit into
release/10.0.3xxfrom
darc-release/10.0.3xx-34b3a8b5-32b3-4795-88f8-e798a18988f7
Open

[release/10.0.3xx] Source code updates from dotnet/dotnet#54506
dotnet-maestro[bot] wants to merge 1 commit into
release/10.0.3xxfrom
darc-release/10.0.3xx-34b3a8b5-32b3-4795-88f8-e798a18988f7

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented May 29, 2026 •
edited
Loading

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.26270.102 to 10.0.0-preview.26279.106
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.6.6 to 18.6.7
    • Microsoft.Build
  • From 18.6.6-servicing-26270-102 to 18.6.7-servicing-26279-106
    • Microsoft.Build.Localization
  • From 7.6.0-rc.27102 to 7.6.0-rc.28006
    • 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 to 10.0.301
    • Microsoft.Build.Tasks.Git
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab
  • From 5.6.0-2.26270.102 to 5.6.0-2.26279.106
    • 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.CodeAnalysis.Workspaces.MSBuild.BuildHost
    • Microsoft.Net.Compilers.Toolset
    • Microsoft.Net.Compilers.Toolset.Framework
  • From 10.0.0-beta.26270.102 to 10.0.0-beta.26279.106
    • 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.301-servicing.26270.102 to 15.2.302-servicing.26279.106
    • Microsoft.FSharp.Compiler
  • From 18.6.0-release-26270-102 to 18.6.0-release-26279-106
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 10.0.301 to 10.0.302
    • Microsoft.TemplateEngine.Abstractions
    • Microsoft.TemplateEngine.Authoring.TemplateVerifier
    • Microsoft.TemplateEngine.Edge
    • Microsoft.TemplateEngine.Orchestrator.RunnableProjects
    • Microsoft.TemplateEngine.Utils
    • Microsoft.TemplateSearch.Common
  • From 10.0.301-servicing.26270.102 to 10.0.302-servicing.26279.106
    • Microsoft.TemplateEngine.Mocks
    • Microsoft.TemplateEngine.TestHelper
    • Microsoft.TemplateSearch.TemplateDiscovery

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:ad54eeefef23a050a8395a8d2ad99a2d4e0190f5..https://github.com/dotnet/sdk:darc-release/10.0.3xx-34b3a8b5-32b3-4795-88f8-e798a18988f7

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 29, 2026

Caution

🚨 Action Required — Conflict detected

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

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.26268.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 316257 with sources from e196eef

  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

dotnet-maestro Bot commented May 29, 2026

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.

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 29, 2026

Caution

🚨 Action Required — Conflict detected

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

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.26268.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 316379 with sources from ad54eee

  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

dotnet-maestro Bot commented May 29, 2026

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.

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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

0 participants