sdk icon indicating copy to clipboard operation
sdk copied to clipboard
verified publisher icon dotnet

[main] Source code updates from dotnet/dotnet

Open dotnet-maestro[bot] opened this issue 2 weeks ago • 7 comments

[!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

Removed Dependencies

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

Updated Dependencies

  • From 10.0.0-rc.3.25567.101 to 11.0.0-alpha.1.25613.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.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.25567.101 to 10.0.0-preview.25613.101
    • Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal
    • Microsoft.CodeAnalysis.Razor.Tooling.Internal
    • Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
  • From 18.1.0-preview-25567-101 to 18.3.0-preview-25613-101
    • Microsoft.Build
    • Microsoft.Build.Localization
    • Microsoft.NET.Test.Sdk
    • Microsoft.TestPlatform.Build
    • Microsoft.TestPlatform.CLI
  • From 7.0.0-preview.2.256 to 7.0.0-preview.1.11401
    • 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.0-beta.25567.101 to 11.0.100-alpha.25613.101
    • 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.25567.101 to 5.3.0-1.25613.101
    • 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.25567.101 to 2.0.0-preview.1.25613.101
    • Microsoft.Deployment.DotNet.Releases
  • From 2.2.0-beta.25567.101 to 3.0.0-alpha.25613.101
    • Microsoft.DiaSymReader
  • From 11.0.0-beta.25567.101 to 11.0.0-beta.25613.101
    • 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.0.0-alpha1.25567.101 to 15.1.200-servicing.25613.101
    • Microsoft.FSharp.Compiler
  • From 11.0.100-alpha.25567.101 to 11.0.100-alpha.25613.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 3.2.0-preview.25567.101 to 3.3.0-preview.25613.101
    • Microsoft.Web.Xdt
  • From 3.0.0-alpha.1.25567.101 to 3.0.0-alpha.1.25613.101
    • System.CommandLine
  • From 11.0.0-alpha.1.25609.108 to 11.0.0-alpha.1.25613.101
    • Microsoft.DotNet.Wpf.ProjectTemplates

Associated changes in source repos

  • https://github.com/dotnet/arcade/compare/488413fe104056170673a048a07906314e101e5d...8adf115288fa51feaa30d063b946478054c7f7b4
  • https://github.com/dotnet/aspnetcore/compare/0aefdae365ff9b73b52961acafd227309524ce3c...c5f8422073be4a98c9cf3f75c58f9a0d59fdf073
  • https://github.com/dotnet/cecil/compare/2a768f2c8a54077cd7d788bb135caeb4d7206a15...82f47fc2ff84b3d94e910147d52f2e6795f6ae21
  • https://github.com/dotnet/command-line-api/compare/0b4618bc860374941e605d8eb1d2bc29c32801db...cf5fd8d696450a48d3cc75a7a1792d34b5303f88
  • https://github.com/dotnet/deployment-tools/compare/c0c52874069a4dc0fe1e880014e6a5f316e9d3b8...6ebef72019b85958ae78d0da73ea49a161c7a28a
  • https://github.com/dotnet/diagnostics/compare/53c7e6f445c2d1a918707a609b0fd08c3604c659...73f1fdca8d9fb191297a7e687790b804f4e78ef5
  • https://github.com/dotnet/efcore/compare/0a2e257733cdfde0d5c38907f47693ef9ff9ecd4...25e60dc7aeaecb90172339831f6e114a1c28d848
  • https://github.com/dotnet/emsdk/compare/aead567b56fe284ee05b3bb324705b76331d4719...f8b85873c9157f00b4951a78977fa87e3ab7c628
  • https://github.com/dotnet/fsharp/compare/38e76550a9bee6b35854742e239338245990dcc9...89d788641914c5d0b87fddfa11f4df0b5cfaa73d
  • https://github.com/dotnet/msbuild/compare/ce41c053ea92f0f9cf5f68d44015490ec30edfa6...2235ffd325c3926d0392fae9dcc2dcb6a623f1eb
  • https://github.com/dotnet/razor/compare/e42cd30de6aaf566c1c489b66ed80904be5e890b...2d8783f051d7f5d31fc1b2014de263ded199eb3f
  • https://github.com/dotnet/runtime/compare/a2f46fc059ce2ce06a3f36c4d63d965163be2200...bce6119e41ecfbcf630c369836770669604c22c6
  • https://github.com/dotnet/scenario-tests/compare/082359066ee0064039b9b1f1f025bdd0507d06de...21ded7efec7463ab807b22a8e119b228d4039a1c
  • https://github.com/dotnet/sdk/compare/4223d2f78f7e5b33c6366fa170c3e4a5a1686a26...6a6992f5fc42dbd06cd24f3a7db40013035d3965
  • https://github.com/dotnet/source-build-reference-packages/compare/e6ae81a48df0569bea8f2e5d67a37c768904e33f...1c0ba39805434d3be12679eb7fe5deb9a221e32c
  • https://github.com/dotnet/sourcelink/compare/9b949eeb2d5dba635c06ae936b50d2141b0aabe2...d656e7bc73c28d039e6baf6d591c905ea8b76ee1
  • https://github.com/dotnet/symreader/compare/ee968d4a1bf717f4bba3a4ffc3f93b5c9870b117...2255aa6d6c21541848933c33f72e60363041abaf
  • https://github.com/dotnet/templating/compare/6f87c6d00c5784010a40ba588135eca38123a335...41ef93aacf72633b58372a9841d8940f6d87ae26
  • https://github.com/microsoft/vstest/compare/81d120f85fbdddc7b981e910a127bd6ef913cd42...bbee830b0ef18eb5b4aa5daee65ae35a34f8c132
  • https://github.com/dotnet/windowsdesktop/compare/9f2ae28ea4f111e6a336682484e5aa412e114f3c...132afbade9e2ce626f26e27c136f34af73dde2f1
  • https://github.com/dotnet/winforms/compare/e53fd3599f4d1e17f3ebc1f3ab9a0dad05805422...6b55842360e78bd1d7b15977694524fc092b7cc7
  • https://github.com/dotnet/wpf/compare/519468037f9b797440548c4d744fc7807573026f...37b9597bebaf48196a05f6d6212ec1e9bc24352f
  • https://github.com/dotnet/xdt/compare/ec086785dfa9af4a0dc58eca3e5c969e3d0c6003...a37116d1c37e696cc70fc138c01d02dff7542d82
Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:dc803dea8a5917a87a812a05bae596c299368a43..https://github.com/dotnet/sdk:darc-main-69be82f7-4ac6-49d6-a47f-19dac1d9d278

dotnet-maestro[bot] avatar Dec 11 '25 16:12 dotnet-maestro[bot]

@premun Should I expect that comment changes in the V.D.xml files backflow? https://github.com/dotnet/sdk/pull/52135/files#diff-fb62e94a1d6f29f863e3d0a22aa38269f6cd1d7f03b109dc06e2cbf2548b86d3R236-R248

that's not there in main in the VMR. I think it has the actual properties correct though.

mmitche avatar Dec 11 '25 17:12 mmitche

Known issue #5637

Error: .dotnet\sdk\10.0.100\NuGet.targets(196,5): error : (NETCORE_ENGINEERING_TELEMETRY=Restore) '[]' is not a valid version string.

DonnaChen888 avatar Dec 12 '25 06:12 DonnaChen888

There are also two dependencies Microsoft.CodeAnalysis.ExternalAccess.HotReload in V.D.xml

premun avatar Dec 12 '25 08:12 premun

@mmitche comments from the file won't flow. We compute list of updates on each side, merge them in memory and then manipulate the XML attributes/tags directly (like we do for update dependencies). So no XML comments are touched.

premun avatar Dec 12 '25 08:12 premun

Known issue #5637

Error: .dotnet\sdk\10.0.100\NuGet.targets(196,5): error : (NETCORE_ENGINEERING_TELEMETRY=Restore) '[]' is not a valid version string.

@DonnaChen888 I don't think that's the issue here. I think what has happened is that the 11.0 template packages have flowed in but the bundled templates targets are still trying to download the 10.0 packages based on properties that no longer exist.

mmitche avatar Dec 12 '25 16:12 mmitche

@DonnaChen888 I've pushed at least the basics of the change up

mmitche avatar Dec 12 '25 16:12 mmitche

The directory 'D:\a\_work\1\s\artifacts\obj\redist\Release\net10.0\templates-11.0' could not be found. - should we update NetCurrent so we look in the .net11 folder?

Thanks for helping with the package flow.

nagilson avatar Dec 12 '25 19:12 nagilson

The directory 'D:\a\_work\1\s\artifacts\obj\redist\Release\net10.0\templates-11.0' could not be found. - should we update NetCurrent so we look in the .net11 folder?

Thanks for helping with the package flow.

I think updating NetCurrent here will have other undesirable effects? Maybe need to just hardcode that location to net11 with a note to change it back later.

mmitche avatar Dec 15 '25 17:12 mmitche

The directory 'D:\a\_work\1\s\artifacts\obj\redist\Release\net10.0\templates-11.0' could not be found. - should we update NetCurrent so we look in the .net11 folder? Thanks for helping with the package flow.

I think updating NetCurrent here will have other undesirable effects? Maybe need to just hardcode that location to net11 with a note to change it back later.

Shouldn't main be 11 at this point?

joeloff avatar Dec 15 '25 18:12 joeloff

[!CAUTION] There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/5059bb6c1e9449762ef058ada17e2ddbbff2ac67 Files conflicting with the head branch:

  • Directory.Packages.props 🔍 View file in dotnet/sdk vs VMR
  • eng/Signing.props 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/BundledSdks.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/Crossgen.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets 🔍 View file in dotnet/sdk vs VMR

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

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

dotnet-maestro[bot] avatar Dec 17 '25 02:12 dotnet-maestro[bot]

[!CAUTION] There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/5059bb6c1e9449762ef058ada17e2ddbbff2ac67 Files conflicting with the head branch:

  • Directory.Packages.props 🔍 View file in dotnet/sdk vs VMR
  • eng/Signing.props 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/BundledSdks.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/Crossgen.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets 🔍 View file in dotnet/sdk vs VMR

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

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

dotnet-maestro[bot] avatar Dec 17 '25 06:12 dotnet-maestro[bot]

[!CAUTION] There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/5059bb6c1e9449762ef058ada17e2ddbbff2ac67 Files conflicting with the head branch:

  • Directory.Packages.props 🔍 View file in dotnet/sdk vs VMR
  • eng/Signing.props 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/BundledSdks.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/Crossgen.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets 🔍 View file in dotnet/sdk vs VMR

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

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

dotnet-maestro[bot] avatar Dec 18 '25 01:12 dotnet-maestro[bot]

[!CAUTION] There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/162eebc5c92f472c9255c3225b522b32485c2df2 Files conflicting with the head branch:

  • Directory.Packages.props 🔍 View file in dotnet/sdk vs VMR
  • eng/Signing.props 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/BundledSdks.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Layout/redist/targets/Crossgen.targets 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj 🔍 View file in dotnet/sdk vs VMR
  • src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets 🔍 View file in dotnet/sdk vs VMR

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

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

dotnet-maestro[bot] avatar Dec 18 '25 07:12 dotnet-maestro[bot]

I'm closing this PR and will trigger a new one. The manual commits here are already part of the VMR.

ViktorHofer avatar Dec 18 '25 12:12 ViktorHofer

@premun / @dkurepa any idea why this subscription doesn't create a new PR?

https://github.com/dotnet/dotnet (.NET 11.0.1xx SDK) ==> 'https://github.com/dotnet/sdk' ('main')

ViktorHofer avatar Dec 18 '25 12:12 ViktorHofer

@ViktorHofer I only see a trigger to it now in 13:37 when I triggered it

premun avatar Dec 18 '25 12:12 premun

Looks like something is up with the service :D

image

premun avatar Dec 18 '25 12:12 premun