[main] Source code updates from dotnet/dotnet#53613
[main] Source code updates from dotnet/dotnet#53613dotnet-maestro[bot] wants to merge 9 commits intomainfrom
Conversation
[[ commit created by automation ]]
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.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.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 11.0.0-preview.3.26153.117 -> 11.0.0-preview.3.26176.106) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.26153.117 -> 10.0.0-preview.26176.106) Microsoft.Build, Microsoft.Build.Localization (Version 18.6.0-preview-26153-117 -> 18.6.0-preview-26176-106) 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.5.0-rc.15417 -> 7.6.0-rc.17706) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, 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-preview.3.26153.117 -> 11.0.100-preview.3.26176.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.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.6.0-2.26153.117 -> 5.6.0-2.26176.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.26153.117 -> 2.0.0-preview.1.26176.106) Microsoft.DiaSymReader, System.CommandLine (Version 3.0.0-preview.3.26153.117 -> 3.0.0-preview.3.26176.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 (Version 11.0.0-beta.26153.117 -> 11.0.0-beta.26176.106) Microsoft.FSharp.Compiler (Version 15.2.100-preview3.26153.117 -> 15.2.100-preview3.26176.106) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.5.0-preview-26153-117 -> 18.5.0-preview-26176-106) Microsoft.Web.Xdt (Version 3.3.0-preview.3.26153.117 -> 3.3.0-preview.3.26176.106) Added Dependencies: Microsoft.Extensions.DependencyInjection.Abstractions (Version 11.0.0-preview.3.26176.106) [[ commit created by automation ]]
(cherry picked from commit 2fbadcb)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ViktorHofer <7412651+ViktorHofer@users.noreply.github.com> (cherry picked from commit 83d346c)
(cherry picked from commit ca8b34c)
…om sys.cl due to PR dotnet/command-line-api#2747 (cherry picked from commit 9ebeea7)
|
The remaining wasm faillures are because the sdk tests are using the Wask sdk version from the boostrap sdk not the incoming version. This keeps causing issues, let me see if there is a reasonable way to fix it. |
When the codeflow updates MicrosoftNETCoreAppRuntimePackageVersion, the WebAssembly.Pack version must also be pinned to match. Without this, the workload manifest from the bootstrap SDK resolves an older pack version that doesn't include changes from the incoming runtime (e.g. the Framework SourceType fix from runtime#125329), causing DiscoverPrecompressedAssets to crash on duplicate Identity keys in multi-client Blazor WASM publish scenarios. This mirrors the existing pattern for KnownILCompilerPack, KnownILLinkPack, and KnownCrossgen2Pack. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
|
ILLink test failures (
|
TemplateEngine test failures (
|
|
|
cc @sbomer |
I was overly optimistic it seems. Since the test is built with the bootstrap sdk we need to bump global.json to the incoming version or build the test with the new sdk to get this to pass. |
## Problem After the Newtonsoft.Json → System.Text.Json migration ([#9956](#9956)), `MockTemplateInfo`'s explicit `ITemplateInfo.Tags` and `ITemplateInfo.CacheParameters` implementations throw `NotImplementedException`. Newtonsoft never visited these during serialization, but System.Text.Json walks all interface properties when serializing, causing `TemplateDiscoveryMetadata.ToJObject()` to crash: ``` System.NotImplementedException : The method or operation is not implemented. at MockTemplateInfo.ITemplateInfo.get_Tags() at System.Text.Json.Serialization...JsonPropertyInfo`1.GetMemberAndWriteJson ``` This breaks all `CacheSearchCoordinatorTests` in the SDK CI ([sdk#53613](dotnet/sdk#53613)). ## Fix Return empty dictionaries instead of throwing. Both properties are `[Obsolete]` — the mock's real tag data lives in the `TagsCollection` property.
dotnet-new
|
- NativeAot: Account for 'lib' prefix on Unix native library outputs (runtime#124611 made this the default for non-Windows) - dotnet-new: Update Verify snapshots for STJ error messages (templating#9956 migrated from Newtonsoft.Json to System.Text.Json, changing the corrupted JSON error text) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
4f4ca13 to
0be720c
Compare
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.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 (Version 11.0.0-preview.3.26176.106 -> 11.0.0-preview.3.26177.105) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.26176.106 -> 10.0.0-preview.26177.105) Microsoft.Build, Microsoft.Build.Localization (Version 18.6.0-preview-26176-106 -> 18.6.0-preview-26177-105) 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.6.0-rc.17706 -> 7.6.0-rc.17805) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, 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-preview.3.26176.106 -> 11.0.100-preview.3.26177.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 (Version 5.6.0-2.26176.106 -> 5.6.0-2.26177.105) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.26176.106 -> 2.0.0-preview.1.26177.105) Microsoft.DiaSymReader, System.CommandLine (Version 3.0.0-preview.3.26176.106 -> 3.0.0-preview.3.26177.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.XUnitExtensions (Version 11.0.0-beta.26176.106 -> 11.0.0-beta.26177.105) Microsoft.FSharp.Compiler (Version 15.2.100-preview3.26176.106 -> 15.2.100-preview3.26177.105) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.5.0-preview-26176-106 -> 18.5.0-preview-26177-105) Microsoft.Web.Xdt (Version 3.3.0-preview.3.26176.106 -> 3.3.0-preview.3.26177.105) [[ commit created by automation ]]
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
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
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch