From 0eba5a61b7d9ee7f28a2b075125ba23bab460445 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jan 2026 02:05:02 +0000 Subject: [PATCH 01/12] Backflow from https://github.com/dotnet/dotnet / a5e14c5 build 297490 [[ commit created by automation ]] --- eng/Publishing.props | 4 +- src/RazorSdk/Tool/DiscoverCommand.cs | 5 +- src/RazorSdk/Tool/GenerateCommand.cs | 19 ++- .../Manifests/manifest-packages.csproj | 9 +- src/Workloads/VSInsertion/workloads.csproj | 110 +++++++++++++++++- 5 files changed, 126 insertions(+), 21 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 802134fadee4..aa0b5f1bdc50 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,7 +43,9 @@ - + + diff --git a/src/RazorSdk/Tool/DiscoverCommand.cs b/src/RazorSdk/Tool/DiscoverCommand.cs index 3b12d2375c41..d84727d4bcc2 100644 --- a/src/RazorSdk/Tool/DiscoverCommand.cs +++ b/src/RazorSdk/Tool/DiscoverCommand.cs @@ -171,13 +171,14 @@ private int ExecuteCore(RazorConfiguration configuration, string projectDirector b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences }); b.Features.Add(new CompilationTagHelperFeature()); - b.Features.Add(new DefaultTagHelperDescriptorProvider()); + + b.RegisterDefaultTagHelperProducer(); CompilerFeatures.Register(b); }); var feature = engine.Engine.Features.OfType().Single(); - var tagHelpers = feature.GetDescriptors(); + var tagHelpers = feature.GetTagHelpers(); using (var stream = new MemoryStream()) { diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index bf889875d0f7..d76d49b0eb10 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -3,6 +3,7 @@ #nullable disable +using System.Collections.Immutable; using System.Diagnostics; using System.Threading; using Microsoft.AspNetCore.Razor.Language; @@ -190,7 +191,7 @@ private int ExecuteCore( { b.RegisterExtensions(); - b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, }); + b.Features.Add(new StaticTagHelperFeature(tagHelpers)); b.ConfigureCodeGenerationOptions(b => { @@ -297,11 +298,11 @@ private VirtualRazorProjectFileSystem GetVirtualRazorProjectSystem(SourceItem[] return project; } - private IReadOnlyList GetTagHelpers(string tagHelperManifest) + private static TagHelperCollection GetTagHelpers(string tagHelperManifest) { if (!File.Exists(tagHelperManifest)) { - return Array.Empty(); + return []; } using (var stream = File.OpenRead(tagHelperManifest)) @@ -311,8 +312,9 @@ private IReadOnlyList GetTagHelpers(string tagHelperManifes var serializer = new JsonSerializer(); serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance); - var descriptors = serializer.Deserialize>(reader); - return descriptors; + var tagHelpers = serializer.Deserialize>(reader); + + return TagHelperCollection.Create(tagHelpers); } } @@ -430,12 +432,9 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP public string CssScope { get; } } - private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature + private sealed class StaticTagHelperFeature(TagHelperCollection tagHelpers) : RazorEngineFeatureBase, ITagHelperFeature { - public IReadOnlyList TagHelpers { get; set; } - - public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; - public IReadOnlyList GetDescriptors() => TagHelpers; + public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => tagHelpers; } } } diff --git a/src/Workloads/Manifests/manifest-packages.csproj b/src/Workloads/Manifests/manifest-packages.csproj index a2d2d219dec1..11fcc4496309 100644 --- a/src/Workloads/Manifests/manifest-packages.csproj +++ b/src/Workloads/Manifests/manifest-packages.csproj @@ -1,13 +1,18 @@ - + + + + <_VersionOverride Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">Version=$(DotNet1xxWorkloadManifestVersion) + + + Properties="ManifestDirectory=$(ManifestDirectory);$(_VersionOverride)" /> \ No newline at end of file diff --git a/src/Workloads/VSInsertion/workloads.csproj b/src/Workloads/VSInsertion/workloads.csproj index c4d5f777d8c5..3aa6a026e718 100644 --- a/src/Workloads/VSInsertion/workloads.csproj +++ b/src/Workloads/VSInsertion/workloads.csproj @@ -80,9 +80,10 @@ - - - + + + + @@ -94,13 +95,82 @@ - + + + <_ManifestProjectFiles Include="../Manifests/**/*.proj" Exclude="../Manifests/**/*.Transport.*/*.proj" /> + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,7 +181,35 @@ UseHardlinksIfPossible="true" /> - + + + + + + + + + + + + + + + From 136cbb78ea6ad2dc3b7f05a8396b3e8462bf0ef4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jan 2026 02:05:03 +0000 Subject: [PATCH 02/12] Update dependencies --- NuGet.config | 3 - eng/Version.Details.props | 254 ++++++------- eng/Version.Details.xml | 376 ++++++++++--------- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 6 +- global.json | 6 +- 7 files changed, 321 insertions(+), 328 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e04985571cd..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -41,7 +39,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7ecd9c967079..41b7695d48d8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,16 +5,69 @@ This file should be imported by eng/Versions.props --> - - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 + + 10.0.0-preview.26065.103 + 18.3.0-preview-26065-103 + 18.3.0-preview-26065-103 + 7.3.0-preview.1.6603 + 10.0.200-alpha.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 10.0.0-preview.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 10.0.0-beta.26065.103 + 15.1.200-servicing.26065.103 + 5.3.0-2.26065.103 + 5.3.0-2.26065.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.26065.103 + 18.3.0-release-26065-103 + 10.0.200-alpha.26065.103 + 10.0.200-alpha.26065.103 + 10.0.200-alpha.26065.103 + 10.0.200-alpha.26065.103 + 10.0.200-alpha.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 10.0.200-preview.26065.103 + 18.3.0-release-26065-103 + 18.3.0-release-26065-103 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 + 7.3.0-preview.1.6603 10.0.1-servicing.25569.105 10.0.1-servicing.25569.105 @@ -40,11 +93,12 @@ This file should be imported by eng/Versions.props 10.0.1-servicing.25569.105 10.0.1 10.0.1 - 10.0.0-beta.25569.105 2.0.0-preview.1.25569.105 2.2.1-beta.25569.105 10.0.1 10.0.1 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 10.0.1 10.0.1 10.0.1 @@ -61,11 +115,6 @@ This file should be imported by eng/Versions.props 10.0.1-servicing.25569.105 10.0.1 10.0.1-servicing.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 3.2.1-servicing.25569.105 10.0.1 10.0.1-servicing.25569.105 @@ -94,68 +143,48 @@ This file should be imported by eng/Versions.props 10.0.1 2.1.0 - - 10.0.0-preview.7.25377.103 - - 18.3.0-preview-25610-02 - 18.3.0-preview-25610-02 - - 15.1.200-servicing.25605.1 - - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 2.1.0-preview.26065.7 4.1.0-preview.26065.7 - + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftSourceLinkAzureReposGitPackageVersion) + $(MicrosoftSourceLinkBitbucketGitPackageVersion) + $(MicrosoftSourceLinkCommonPackageVersion) + $(MicrosoftSourceLinkGitHubPackageVersion) + $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) @@ -165,6 +194,24 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) @@ -190,11 +237,12 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -211,11 +259,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftSourceLinkAzureReposGitPackageVersion) - $(MicrosoftSourceLinkBitbucketGitPackageVersion) - $(MicrosoftSourceLinkCommonPackageVersion) - $(MicrosoftSourceLinkGitHubPackageVersion) - $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) @@ -244,61 +287,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - - $(MicrosoftFSharpCompilerPackageVersion) - - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) - - $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) - - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e05afcd479..a8ee0a668e2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/fsharp - 89d788641914c5d0b87fddfa11f4df0b5cfaa73d + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e @@ -514,43 +514,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + a5e14c5461b3bb2707e1bf5ee4640caff4f1db4e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbd..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index 0daa834cedbd..3d3625fd0e81 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.100", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26065.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 4e930817059379e2fef8f60845c810c7e0c8c2ba Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Tue, 20 Jan 2026 14:21:44 +0800 Subject: [PATCH 03/12] Add back dotnet nuget sources --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..7e04985571cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,8 @@ + + @@ -39,6 +41,7 @@ + From edea79874d21f404f25d5f33f709e876afa894c1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Jan 2026 13:07:50 -0800 Subject: [PATCH 04/12] Skip DotnetCliSnapshotTests due to known issue --- test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs index 9c7efb37cada..9dfe150779e8 100644 --- a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs +++ b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs @@ -11,7 +11,7 @@ public class DotnetCliSnapshotTests : SdkTest public DotnetCliSnapshotTests(ITestOutputHelper log) : base(log) { } [MemberData(nameof(ShellNames))] - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/48817")] public async Task VerifyCompletions(string shellName) { var provider = CompletionsCommand.DefaultShells.Single(x => x.ArgumentName == shellName); From 64d2da4fe0c43ed239a09bfedf50276b115e1632 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 13 Jan 2026 11:58:55 -0800 Subject: [PATCH 05/12] add missing details from the package spec --- .../GivenAResolvePackageAssetsTask.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs index 59c329436039..966c4eb6c66c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs @@ -139,6 +139,13 @@ private static string AssetsFileWithInvalidLocale(string tfm, string locale) => `{tfm}`: { `targetAlias`: `{tfm}` } + }, + `restore`: { + `frameworks`: { + `{tfm}`: { + `targetAlias`: `{tfm}` + } + } } } }".Replace("`", "\"").Replace("{tfm}", tfm).Replace("{locale}", locale); From 15674313bfb78d47ea75dc522062bf2ae695e0bf Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:27:10 -0800 Subject: [PATCH 06/12] Fix another restore section in assets file --- .../GivenAResolvePackageAssetsTask.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs index 966c4eb6c66c..4cad4fcc9867 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs @@ -101,6 +101,13 @@ public void It_does_not_error_on_duplicate_package_names() `net5.0`: { `targetAlias`: `net5.0` } + }, + `restore`: { + `frameworks`: { + `net5.0`: { + `targetAlias`: `net5.0` + } + } } } }".Replace('`', '"'); From 0993775cc3855d3cfa1950281d1d63e11d972041 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 14 Jan 2026 16:24:38 -0800 Subject: [PATCH 07/12] Adjust expected diagnostics in DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync --- .../Runtime/DisposeObjectsBeforeLosingScopeTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index c1c03c4122d5..9c89c0026e2f 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -8197,8 +8197,8 @@ class B : IDisposable { public void Dispose() { - A x = new A();{|CS1525:|} - = x{|CS1002:|} + A x = new A(); + {|CS1525:=|} x{|CS1002:|} } } "); From 91486de877ce75d6f4f48a365041de797895dbef Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:41:55 -0800 Subject: [PATCH 08/12] Update test baselines --- ...ledPackage_LocalPackage.Linux.verified.txt | 2 +- ...alledPackage_LocalPackage.OSX.verified.txt | 2 +- ...dPackage_LocalPackage.Windows.verified.txt | 30 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt index 8f48b106823e..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt @@ -22,24 +22,24 @@ TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.ExistingProject Test Asset TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.MyProject Test Asset TestAssets.PostActions.AddJsonProperty.WithS... TestAssets.PostActions.AddJsonProperty.WithSourceNameChangeInJson Test Asset - TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.Basic Test Asset + TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectReference.B... TestAssets.PostActions.AddProjectReference.Basic Test Asset - TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.Existing Test Asset + TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset + TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicInSolutionRoot Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes Test Asset - TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.Instructions.Basic TestAssets.PostActions.Instructions.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.Basic TestAssets.PostActions.RestoreNuGet.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPath Test Asset + TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Ma... TestAssets.PostActions.RestoreNuGet.Files_MatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Mi... TestAssets.PostActions.RestoreNuGet.Files_MismatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Pa... TestAssets.PostActions.RestoreNuGet.Files_PatternWithFileName Test Asset @@ -48,16 +48,16 @@ TestAssets.PostActions.RestoreNuGet.Files_Su... TestAssets.PostActions.RestoreNuGet.Files_SupportSemicolonDelimitedList Test Asset TestAssets.PostActions.RestoreNuGet.Invalid TestAssets.PostActions.RestoreNuGet.Invalid Test Asset TestAssets.PostActions.RestoreNuGet.Invalid.... TestAssets.PostActions.RestoreNuGet.Invalid.ContinueOnError Test Asset - TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRename Test Asset + TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsPrimaryOutputs Test Asset - TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames Test Asset + TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RunScript.Basic TestAssets.PostActions.RunScript.Basic Test Asset TestAssets.PostActions.RunScript.DoNotRedirect TestAssets.PostActions.RunScript.DoNotRedirect Test Asset - TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.RunScript.Redirect TestAssets.PostActions.RunScript.Redirect Test Asset + TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.UnknownPostAction TestAssets.PostActions.UnknownPostAction Test Asset TemplateConditionalProcessing TestAssets.TemplateConditionalProcessing Test Asset Basic FSharp template-grouping item Test Asset C#,F# @@ -77,28 +77,28 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset + TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset - TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithPreferDefaultName TestAssets.TemplateWithPreferDefaultName project Test Asset + TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithRegexMatchMacro TestAssets.TemplateWithRegexMatchMacro Test Asset TemplateWithRenames TestAssets.TemplateWithRenames Test Asset TemplateWithRequiredParameters TestAssets.TemplateWithRequiredParameters Test Asset TemplateWithSourceBasedRenames TestAssets.TemplateWithSourceBasedRenames Test Asset + TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourceNameAndCustomSourceAndTarg... TestAssets.TemplateWithSourceNameAndCustomSourceAndTargetPaths Test Asset TemplateWithSourceNameAndCustomSourcePath TestAssets.TemplateWithSourceNameAndCustomSourcePath Test Asset TemplateWithSourceNameAndCustomTargetPath TestAssets.TemplateWithSourceNameAndCustomTargetPath Test Asset TemplateWithSourceNameInTargetPathGetsRenamed TestAssets.TemplateWithSourceNameInTargetPathGetsRenamed Test Asset - TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourcePathOutsideConfigRoot TestAssets.TemplateWithSourcePathOutsideConfigRoot Test Asset TemplateWithTags TestAssets.TemplateWithTags project Test Asset C# TemplateWithUnspecifiedSourceName TestAssets.TemplateWithUnspecifiedSourceName Test Asset TemplateWithValueForms TestAssets.TemplateWithValueForms Test Asset - Basic Template Without Exclude withoutexclude project Basic Template With Exclude withexclude project + Basic Template Without Exclude withoutexclude project \ No newline at end of file From 4084d678229c6fe9b6adced6f969b661e490f595 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:42:10 -0800 Subject: [PATCH 09/12] Disable watch test as it's broken by a Roslyn change --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 095822120c0d..1f1564014cf7 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Watch.UnitTests { public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task AddSourceFile() { Log("AddSourceFile started"); From 90bd3186d9e35cbf9aac3a2ed31526f83cbacede Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:53:09 -0800 Subject: [PATCH 10/12] Fix path to razor source-generated files in StaticWebAssets tests --- .../ScopedCssIntegrationTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs index 6155a3498987..39b29f46f052 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs @@ -92,7 +92,7 @@ public void CanOverrideScopeIdentifiers() var scoped = Path.Combine(intermediateOutputPath, "scopedcss", "Styles", "Pages", "Counter.rz.scp.css"); new FileInfo(scoped).Should().Exist(); new FileInfo(scoped).Should().Contain("b-overridden"); - var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generated).Should().Exist(); new FileInfo(generated).Should().Contain("b-overridden"); new FileInfo(Path.Combine(intermediateOutputPath, "scopedcss", "Components", "Pages", "Index.razor.rz.scp.css")).Should().NotExist(); @@ -318,7 +318,7 @@ public void Build_RemovingScopedCssAndBuilding_UpdatesGeneratedCodeAndBundle() new FileInfo(generatedBundle).Should().Exist(); var generatedProjectBundle = Path.Combine(intermediateOutputPath, "scopedcss", "projectbundle", "ComponentApp.bundle.scp.css"); new FileInfo(generatedProjectBundle).Should().Exist(); - var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generatedCounter).Should().Exist(); var componentThumbprint = FileThumbPrint.Create(generatedCounter); From 4ce3ffc22310644aa6baaf94f36855cc5abe6048 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 14:32:39 -0800 Subject: [PATCH 11/12] Disable an additional watch test --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 1f1564014cf7..19a0cc235b9a 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -73,7 +73,7 @@ public static void Print() App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") From 84a2b8fbeaa35d8cc6c870b34762a46d21f54fa1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 15:47:30 -0800 Subject: [PATCH 12/12] Unskip test for ProjectChange_UpdateDirectoryBuildProps Fixed in https://github.com/dotnet/sdk/pull/52578/files according to tmat --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 19a0cc235b9a..1f1564014cf7 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -73,7 +73,7 @@ public static void Print() App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); } - [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] + [Fact] public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps")