Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

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

wants to merge 11 commits into from
+860 −802

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 11, 2025 •
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.100-preview.7.25359.101 to 10.0.100-preview.7.25363.101
    • 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.0-preview.7.25359.101 to 10.0.0-preview.7.25363.101
    • 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.10.0
    • Microsoft.DotNet.Web.ProjectTemplates.10.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.Runtime.Emscripten.Sdk.Internal
    • 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.Composition.AttributedModel
    • System.Composition.Convention
    • System.Composition.Hosting
    • System.Composition.Runtime
    • System.Composition.TypedParts
    • System.Configuration.ConfigurationManager
    • 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 17.15.0-preview-25359-101 to 17.15.0-preview-25363-101
    • Microsoft.Build
    • Microsoft.Build.Localization
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 14.0.100-preview7.25359.101 to 14.0.100-preview7.25363.101
    • Microsoft.FSharp.Compiler
  • From 5.0.0-1.25359.101 to 5.0.0-1.25363.101
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.CSharp
    • Microsoft.CodeAnalysis.CSharp.CodeStyle
    • Microsoft.CodeAnalysis.CSharp.Features
    • Microsoft.CodeAnalysis.CSharp.Workspaces
    • Microsoft.CodeAnalysis.PublicApiAnalyzers
    • Microsoft.CodeAnalysis.Workspaces.Common
    • Microsoft.CodeAnalysis.Workspaces.MSBuild
    • Microsoft.Net.Compilers.Toolset
    • Microsoft.Net.Compilers.Toolset.Framework
  • From 10.0.0-preview.25359.101 to 10.0.0-preview.25363.101
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.NetAnalyzers
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 3.2.0-preview.25359.101 to 3.2.0-preview.25363.101
    • Microsoft.Web.Xdt
  • From 2.0.0-beta6.25359.101 to 2.0.0-beta7.25363.101
    • System.CommandLine
  • From 2.2.0-beta.25359.101 to 2.2.0-beta.25363.101
    • Microsoft.DiaSymReader
  • From 2.0.0-preview.1.25359.101 to 2.0.0-preview.1.25363.101
    • Microsoft.Deployment.DotNet.Releases
  • From 10.0.0-beta.25359.101 to 10.0.0-beta.25363.101
    • Microsoft.Build.Tasks.Git
    • 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
    • Microsoft.SourceLink.AzureRepos.Git
    • Microsoft.SourceLink.Bitbucket.Git
    • Microsoft.SourceLink.Common
    • Microsoft.SourceLink.GitHub
    • Microsoft.SourceLink.GitLab

Associated changes in source repos

dotnet-maestro bot added 3 commits July 11, 2025 02:09
@dotnet-maestro
[VMR] Codeflow 9503f97-9503f97
0414488 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-7628065e-94f2-4f11-a6d5-3ab587167c53
5cec064
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 274788
095ecec 
Updated Dependencies:
Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-preview.7.25359.101 -> 10.0.100-preview.7.25360.101)
Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.NET.HostModel, System.IO.Hashing, Microsoft.Extensions.DependencyModel, Microsoft.NET.Runtime.Emscripten.Sdk.Internal, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.ILLink.Tasks, System.CodeDom, System.Formats.Asn1, System.Security.Cryptography.ProtectedData, System.Text.Encoding.CodePages, System.Resources.Extensions, Microsoft.WindowsDesktop.App.Ref, Microsoft.WindowsDesktop.App.Internal, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.Extensions.FileProviders.Embedded, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components.Web, Microsoft.JSInterop, Microsoft.Extensions.ObjectPool, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.TestHost, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.FileSystemGlobbing, System.ServiceProcess.ServiceController, System.Text.Json, Microsoft.Bcl.AsyncInterfaces, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Win32.SystemEvents, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions, System.Reflection.MetadataLoadContext, Microsoft.Extensions.Configuration.Ini (Version 10.0.0-preview.7.25359.101 -> 10.0.0-preview.7.25360.101)
Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.CLI, Microsoft.TestPlatform.Build (Version 17.15.0-preview-25359-101 -> 17.15.0-preview-25360-101)
Microsoft.FSharp.Compiler (Version 14.0.100-preview7.25359.101 -> 14.0.100-preview7.25360.101)
Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.CodeAnalysis.PublicApiAnalyzers (Version 5.0.0-1.25359.101 -> 5.0.0-1.25360.101)
Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport, Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25359.101 -> 10.0.0-preview.25360.101)
Microsoft.Web.Xdt (Version 3.2.0-preview.25359.101 -> 3.2.0-preview.25360.101)
System.CommandLine (Version 2.0.0-beta6.25359.101 -> 2.0.0-beta6.25360.101)
Microsoft.DiaSymReader (Version 2.2.0-beta.25359.101 -> 2.2.0-beta.25360.101)
Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25359.101 -> 2.0.0-preview.1.25360.101)
Microsoft.Build.Tasks.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, Microsoft.SourceLink.Bitbucket.Git, 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.XUnitExtensions, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25359.101 -> 10.0.0-beta.25360.101)
This was referenced Jul 11, 2025
Open
Open
Open
@SimonZhao888
Copy link
Member

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@build-analysis build-analysis bot mentioned this pull request Jul 11, 2025
Open
dotnet-maestro bot added 3 commits July 13, 2025 02:05
@dotnet-maestro
[VMR] Codeflow 86117ef-095ecec
abfefb6 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-7628065e-94f2-4f11-a6d5-3ab587167c53
492cbbc 
Auto-resolved conflicts:
- eng/Version.Details.xml
- eng/Versions.props
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275021
96d5126 
Updated Dependencies:
Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-preview.7.25360.101 -> 10.0.100-preview.7.25362.103)
Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.NET.HostModel, System.IO.Hashing, Microsoft.Extensions.DependencyModel, Microsoft.NET.Runtime.Emscripten.Sdk.Internal, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.ILLink.Tasks, System.CodeDom, System.Formats.Asn1, System.Security.Cryptography.ProtectedData, System.Text.Encoding.CodePages, System.Resources.Extensions, Microsoft.WindowsDesktop.App.Ref, Microsoft.WindowsDesktop.App.Internal, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.Extensions.FileProviders.Embedded, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components.Web, Microsoft.JSInterop, Microsoft.Extensions.ObjectPool, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.TestHost, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.FileSystemGlobbing, System.ServiceProcess.ServiceController, System.Text.Json, Microsoft.Bcl.AsyncInterfaces, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Win32.SystemEvents, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions, System.Reflection.MetadataLoadContext, Microsoft.Extensions.Configuration.Ini (Version 10.0.0-preview.7.25360.101 -> 10.0.0-preview.7.25362.103)
Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.CLI, Microsoft.TestPlatform.Build (Version 17.15.0-preview-25360-101 -> 17.15.0-preview-25362-103)
Microsoft.FSharp.Compiler (Version 14.0.100-preview7.25360.101 -> 14.0.100-preview7.25362.103)
Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.CodeAnalysis.PublicApiAnalyzers (Version 5.0.0-1.25360.101 -> 5.0.0-1.25362.103)
Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport, Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25360.101 -> 10.0.0-preview.25362.103)
Microsoft.Web.Xdt (Version 3.2.0-preview.25360.101 -> 3.2.0-preview.25362.103)
System.CommandLine (Version 2.0.0-beta6.25360.101 -> 2.0.0-beta7.25362.103)
Microsoft.DiaSymReader (Version 2.2.0-beta.25360.101 -> 2.2.0-beta.25362.103)
Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25360.101 -> 2.0.0-preview.1.25362.103)
Microsoft.Build.Tasks.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, Microsoft.SourceLink.Bitbucket.Git, 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.XUnitExtensions, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25360.101 -> 10.0.0-beta.25362.103)
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="sdk" Sha="f65cc9c656ea330c50ed30694c4b0834489f7f6d" BarId="275021" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@dotnet-maestro dotnet-maestro bot requested review from a team as code owners July 13, 2025 02:05
@build-analysis build-analysis bot mentioned this pull request Jul 13, 2025
Open
5 tasks
dotnet-maestro bot and others added 4 commits July 14, 2025 02:05
@dotnet-maestro
[VMR] Codeflow 1414d33-1414d33
de61845 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 275039
bc3cfec 
Updated Dependencies:
Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-preview.7.25362.103 -> 10.0.100-preview.7.25363.101)
Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.NET.HostModel, System.IO.Hashing, Microsoft.Extensions.DependencyModel, Microsoft.NET.Runtime.Emscripten.Sdk.Internal, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.ILLink.Tasks, System.CodeDom, System.Formats.Asn1, System.Security.Cryptography.ProtectedData, System.Text.Encoding.CodePages, System.Resources.Extensions, Microsoft.WindowsDesktop.App.Ref, Microsoft.WindowsDesktop.App.Internal, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.Extensions.FileProviders.Embedded, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components.Web, Microsoft.JSInterop, Microsoft.Extensions.ObjectPool, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.TestHost, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.FileSystemGlobbing, System.ServiceProcess.ServiceController, System.Text.Json, Microsoft.Bcl.AsyncInterfaces, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Win32.SystemEvents, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions, System.Reflection.MetadataLoadContext, Microsoft.Extensions.Configuration.Ini (Version 10.0.0-preview.7.25362.103 -> 10.0.0-preview.7.25363.101)
Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.CLI, Microsoft.TestPlatform.Build (Version 17.15.0-preview-25362-103 -> 17.15.0-preview-25363-101)
Microsoft.FSharp.Compiler (Version 14.0.100-preview7.25362.103 -> 14.0.100-preview7.25363.101)
Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.CodeAnalysis.PublicApiAnalyzers (Version 5.0.0-1.25362.103 -> 5.0.0-1.25363.101)
Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport, Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25362.103 -> 10.0.0-preview.25363.101)
Microsoft.Web.Xdt (Version 3.2.0-preview.25362.103 -> 3.2.0-preview.25363.101)
System.CommandLine (Version 2.0.0-beta7.25362.103 -> 2.0.0-beta7.25363.101)
Microsoft.DiaSymReader (Version 2.2.0-beta.25362.103 -> 2.2.0-beta.25363.101)
Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25362.103 -> 2.0.0-preview.1.25363.101)
Microsoft.Build.Tasks.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, Microsoft.SourceLink.Bitbucket.Git, 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.XUnitExtensions, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25362.103 -> 10.0.0-beta.25363.101)
@GangWang01
Merge branch 'main' into darc-main-7628065e-94f2-4f11-a6d5-3ab587167c53
4b0ed21
@jjonescz
Fix build errors
5974af0
This was referenced Jul 14, 2025
Open
Merged
jjonescz
jjonescz reviewed Jul 14, 2025
View reviewed changes
src/BuiltInTools/dotnet-watch/CommandLine/CommandLineOptions.cs
@@ -90,17 +90,14 @@ internal sealed class CommandLineOptions
var rootCommandInvoked = false;
rootCommand.SetAction(parseResult => rootCommandInvoked = true);

var cliConfig = new CommandLineConfiguration(rootCommand)
Copy link
Member

@jjonescz jjonescz Jul 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many tests are now failing with

Unhandled exception. System.TypeLoadException: Could not load type 'System.CommandLine.CommandLineConfiguration' from assembly 'System.CommandLine, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.
   at NuGet.CommandLine.XPlat.Program.MainInternal(String[] args, CommandOutputLogger log, IEnvironmentVariableReader environmentVariableReader)
   at NuGet.CommandLine.XPlat.Program.MainInternal(String[] args, CommandOutputLogger log, IEnvironmentVariableReader environmentVariableReader)
   at NuGet.CommandLine.XPlat.Program.Main(String[] args)

That's because CommandLineConfiguration was removed in dotnet/command-line-api#2606 but NuGet still depends on it (actually it was updated in the VMR but that probably must flow through NuGet repo first?)

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

@jjonescz jjonescz jjonescz left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Area-CodeFlow
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SimonZhao888 @jjonescz @GangWang01