Skip to content

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

Closed
dotnet-maestro[bot] wants to merge 5 commits into
mainfrom
darc-main-3fc0d9e6-a46a-4309-b915-a3ec40fe1c05
Closed

[main] Source code updates from dotnet/dotnet#54226
dotnet-maestro[bot] wants to merge 5 commits into
mainfrom
darc-main-3fc0d9e6-a46a-4309-b915-a3ec40fe1c05

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented May 7, 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.4.26208.110 to 11.0.0-preview.5.26256.105
    • 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.DependencyInjection.Abstractions
    • 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.26208.110 to 10.0.0-preview.26256.105
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.6.0-preview-26208-110 to 18.7.0-preview-26256-105
    • Microsoft.Build
    • Microsoft.Build.Localization
  • From 7.6.0-rc.20910 to 7.7.0-rc.25705
    • 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.4.26208.110 to 11.0.100-preview.5.26256.105
    • Microsoft.Build.Tasks.Git
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab
  • From 5.7.0-1.26208.110 to 5.7.0-1.26256.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 2.0.0-preview.1.26208.110 to 2.0.0-preview.1.26256.105
    • Microsoft.Deployment.DotNet.Releases
  • From 3.0.0-preview.4.26208.110 to 3.0.0-preview.5.26256.105
    • Microsoft.DiaSymReader
    • System.CommandLine
  • From 11.0.0-beta.26208.110 to 11.0.0-beta.26256.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.XUnitV3Extensions
  • From 15.2.100-preview4.26208.110 to 15.2.101-preview5.26256.105
    • Microsoft.FSharp.Compiler
  • From 18.7.0-preview-26208-110 to 18.8.0-preview-26256-105
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 3.3.0-preview.4.26208.110 to 3.3.0-preview.5.26256.105
    • Microsoft.Web.Xdt

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:d64191f29ec9042e2696d8b7d8326c4bd10ba268..https://github.com/dotnet/sdk:darc-main-3fc0d9e6-a46a-4309-b915-a3ec40fe1c05

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 7, 2026

Caution

🚨 Action Required — Conflict detected

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

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

  • src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Cli/dotnet/Installer/Windows/MsiPayload.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.26255.4 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 94ba9a9b-a084-4c1e-bf44-d0c711c17773 

    This should apply the build 313368 with sources from d64191f

  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.

@nagilson
Copy link
Copy Markdown
Member

nagilson commented May 7, 2026

various fixes lost in #53847 may be needed

nagilson and others added 3 commits May 7, 2026 13:29
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Cherry-picked from 043321b (old codeflow PR #53847).
Changes test class name reference and removes MetadataUpdater.IsSupported entry.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Cherry-picked from 84f3119 (old codeflow PR #53847).
Updates CS1040 -> CS9378 for shebang-related compiler error.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@nagilson
Copy link
Copy Markdown
Member

nagilson commented May 8, 2026

@joeloff @NikolaMilosavljevic The build is failing with this : heat.exe(0,0): error HEAT5149: (NETCORE_ENGINEERING_TELEMETRY=Build) Heat is deprecated and will be removed in WiX v7. - are there missing changes here? I didn't see any issues for us tracking this wix behaivor.

@nagilson nagilson added the wix label May 8, 2026
@marcpopMSFT
Copy link
Copy Markdown
Member

@joeloff @NikolaMilosavljevic The build is failing with this : heat.exe(0,0): error HEAT5149: (NETCORE_ENGINEERING_TELEMETRY=Build) Heat is deprecated and will be removed in WiX v7. - are there missing changes here? I didn't see any issues for us tracking this wix behaivor.

We should not be blocking on that though. This is known future work for next year.

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 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.

1 similar comment
@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 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.

@dsplaisted
Copy link
Copy Markdown
Member

Closing to get an updated flow from dotnet/dotnet.

@dsplaisted dsplaisted closed this May 13, 2026
@dotnet-maestro dotnet-maestro Bot deleted the darc-main-3fc0d9e6-a46a-4309-b915-a3ec40fe1c05 branch May 13, 2026 15:01
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.

4 participants