Skip to content

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

New Dependencies

  • Added 11.0.0-alpha.1.25617.108
    • Microsoft.DotNet.Web.ItemTemplates.11.0
    • Microsoft.DotNet.Web.ProjectTemplates.11.0
    • Microsoft.Dotnet.WinForms.ProjectTemplates
    • Microsoft.Dotnet.Wpf.ProjectTemplates

Removed Dependencies

  • Removed 10.0.0-rc.1.25515.110
    • Microsoft.DotNet.Web.ItemTemplates.10.0
    • Microsoft.DotNet.Web.ProjectTemplates.10.0

Updated Dependencies

  • From 10.0.0-rc.1.25515.110 to 11.0.0-alpha.1.25617.108
    • 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.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.25515.110 to 10.0.0-preview.25617.108
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.1.0-preview-25515-110 to 18.3.0-preview-25617-108
    • Microsoft.Build
    • Microsoft.Build.Localization
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 7.0.0-preview.1.1610 to 7.3.0-preview.1.11808
    • 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.0-beta.25515.110 to 11.0.100-alpha.25617.108
    • 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-1.25515.110 to 5.3.0-1.25617.108
    • Microsoft.CodeAnalysis
    • Microsoft.CodeAnalysis.BuildClient
    • 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 2.0.0-preview.1.25515.110 to 2.0.0-preview.1.25617.108
    • Microsoft.Deployment.DotNet.Releases
  • From 2.2.0-beta.25515.110 to 3.0.0-alpha.25617.108
    • Microsoft.DiaSymReader
  • From 11.0.0-beta.25515.110 to 11.0.0-beta.25617.108
    • 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 4.1.0-preview.25551.1 to 4.1.0-preview.25575.3
    • MSTest
  • From 2.1.0-preview.25551.1 to 2.1.0-preview.25575.3
    • Microsoft.Testing.Platform
  • From 14.0.0-alpha1.25515.110 to 15.1.200-servicing.25617.108
    • Microsoft.FSharp.Compiler
  • From 11.0.100-alpha.25515.110 to 11.0.100-alpha.25617.108
    • 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.2.0-preview.25515.110 to 3.3.0-preview.25617.108
    • Microsoft.Web.Xdt
  • From 2.0.0-rc.1.25515.110 to 3.0.0-alpha.1.25617.108
    • System.CommandLine

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:6ec92e489cc9368695fb6a39c2afb55e1a735dec..https://github.com/dotnet/sdk:darc-main-4deb146e-0f24-4bb6-8e42-4ae49a9c496a

Updated Dependencies:
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.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 (Version 10.0.0-rc.1.25515.110 -> 11.0.0-alpha.1.25617.108)
Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25515.110 -> 10.0.0-preview.25617.108)
Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.1.0-preview-25515-110 -> 18.3.0-preview-25617-108)
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 (Version 7.0.0-preview.1.1610 -> 7.3.0-preview.1.11808)
Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25515.110 -> 11.0.100-alpha.25617.108)
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, 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 (Version 5.3.0-1.25515.110 -> 5.3.0-1.25617.108)
Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25515.110 -> 2.0.0-preview.1.25617.108)
Microsoft.DiaSymReader (Version 2.2.0-beta.25515.110 -> 3.0.0-alpha.25617.108)
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 (Version 11.0.0-beta.25515.110 -> 11.0.0-beta.25617.108)
MSTest (Version 4.1.0-preview.25551.1 -> 4.1.0-preview.25575.3)
Microsoft.Testing.Platform (Version 2.1.0-preview.25551.1 -> 2.1.0-preview.25575.3)
Microsoft.FSharp.Compiler (Version 14.0.0-alpha1.25515.110 -> 15.1.200-servicing.25617.108)
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 (Version 11.0.100-alpha.25515.110 -> 11.0.100-alpha.25617.108)
Microsoft.Web.Xdt (Version 3.2.0-preview.25515.110 -> 3.3.0-preview.25617.108)
System.CommandLine (Version 2.0.0-rc.1.25515.110 -> 3.0.0-alpha.1.25617.108)

Added Dependencies:
Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.Dotnet.Wpf.ProjectTemplates, Microsoft.DotNet.Web.ItemTemplates.11.0, Microsoft.DotNet.Web.ProjectTemplates.11.0 (Version 11.0.0-alpha.1.25617.108)

Removed Dependencies:
Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0 (Version 10.0.0-rc.1.25515.110)
@dotnet-maestro
Copy link
Contributor Author

Caution

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="6ec92e489cc9368695fb6a39c2afb55e1a735dec" BarId="295059" />

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

@joeloff
Copy link
Member

joeloff commented Dec 18, 2025

working on this...

@joeloff
Copy link
Member

joeloff commented Dec 18, 2025

@dotnet/dotnet-analyzers can you help with this error

One or more auto-generated documentation files were either edited manually, or not updated. Please revert changes made to the following files (if manually edited) and run `msbuild /t:pack` at the root of the repo to automatically update them:
      /mnt/vss/_work/1/s/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif

@ViktorHofer
Copy link
Member

Ignore the "Do not automerge downgrades" job failure. That's a false positive.

@dotnet-maestro
Copy link
Contributor Author

Important

The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes.

Please continue with one of the following options:

  1. Close or merge this PR and let the codeflow continue normally
  2. Close or merge this PR and receive the new codeflow immediately by triggering the subscription:
    darc trigger-subscriptions --id 94ba9a9b-a084-4c1e-bf44-d0c711c17773
  3. Force-flow new changes into this PR at your own risk (some PR commits might be reverted):
    darc trigger-subscriptions --force --id 94ba9a9b-a084-4c1e-bf44-d0c711c17773

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

@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 14, 2026

@marcpopMSFT Matt and I just pushed this newer backflow into this branch which contains fixes for all the remaining issues that we found in the VMR. (fix in the template, fix in BundledVersions.props, etc.). This should be last backflow necessary to get this green. For everything else, workarounds should be possible.

@marcpopMSFT
Copy link
Member

@dotnet/dotnet-analyzers need someone to investigate DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync

I can repro locally but have no experience with these types of tests.

Expected diagnostic:
// /0/Test0.cs(17,12,17,12): error CS1002
DiagnosticResult.CompilerError("CS1002").WithSpan(17, 12, 17, 12),


Actual diagnostic:
// /0/Test0.cs(17,9): error CS1525: Invalid expression term '='
DiagnosticResult.CompilerError("CS1525").WithSpan(17, 9, 17, 10).WithArguments("=")

@marcpopMSFT
Copy link
Member

@nkolev92 can you take a look at the following failures
It_warns_on_incorrectly_cased_culture_codes_of_resources
It_warns_on_invalid_culture_codes_of_resources
It_does_not_error_on_duplicate_package_names
Microsoft.NET.Build.Tasks.BuildErrorException : NETSDK1005: Assets file 'C:\h\w\97310878\t\tmpciyyed.tmp' doesn't have a target for 'net5.0'. Ensure that restore has run and that you have included 'net5.0' in the TargetFrameworks for your project.

@marcpopMSFT marcpopMSFT requested a review from a team as a code owner January 15, 2026 00:04
},
`restore`: {
`frameworks`: {
`{tfm}`: {
Copy link
Member

Choose a reason for hiding this comment

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

Won't this mean that folks who might have restored with an older version will have an assets file that's not accepted by the new SDK?

Copy link
Contributor

Choose a reason for hiding this comment

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

We had a quick chat offline and I think there's context that I think would be helpful to a more general audience.

Basically:

NuGet/NuGet.Client@af9df1d#diff-47fd571b272b6e7fc56cb69d458354a22ba65c590645876d09ce8765dcb5de8a

We went from:

         var framework = PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.TargetAlias.Equals(frameworkAlias, StringComparison.OrdinalIgnoreCase))?.FrameworkName;

            if (framework != null)
            {
                return GetTarget(framework, runtimeIdentifier);
            }
            return null;

to

            return Targets.FirstOrDefault(t =>
                t.TargetAlias.Equals(frameworkAlias) &&
                (string.IsNullOrEmpty(runtimeIdentifier) && string.IsNullOrEmpty(t.RuntimeIdentifier) ||
                 string.Equals(runtimeIdentifier, t.RuntimeIdentifier, StringComparison.OrdinalIgnoreCase)));

So before this method would use the project->frameworks->TargetAlias to get the framework and look-up based on that.
Now the reader of the lock file "hydrates" the TargetAlias on the LockFileTarget directly, so we don't have to look-up based on the effective target framework anymore.

That code is done based on project->restore->frameworks->TargetAlias.

Both of these target alias properties were added in NET 5.0, so in the wild, every assets file in the wild that has project->frameworks->TargetAlias also has project->restore->frameworks->TargetAlias.

It just happened that this test bed didn't create the dummy data completely.

@marcpopMSFT marcpopMSFT merged commit a3ff0b0 into main Jan 16, 2026
30 of 32 checks passed
@marcpopMSFT marcpopMSFT deleted the darc-main-4deb146e-0f24-4bb6-8e42-4ae49a9c496a branch January 16, 2026 00:14
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.