From 2dd803c100ac4591a2dfcd9e735c5aaddab38d92 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Jan 2026 10:19:40 -0800 Subject: [PATCH 01/14] Update dependencies for 10.0.2 Microsoft build and then update dependencies for all 2xx repos to the current version in dotnet/dotnet --- NuGet.config | 5 +- eng/Version.Details.props | 262 +++++----- eng/Version.Details.xml | 524 +++++++++---------- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 6 +- global.json | 4 +- 7 files changed, 402 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e04985571cd..82c3d1dd768c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,7 @@ - - + @@ -41,7 +40,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7ecd9c967079..d9b5b8826648 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,149 +6,149 @@ 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.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 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.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 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 - 10.0.1 - 10.0.1 - 2.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.102 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 10.0.0-preview.7.25377.103 - 18.3.0-preview-25610-02 - 18.3.0-preview-25610-02 + 18.3.0-preview-26062-04 + 18.3.0-preview-26062-04 - 15.1.200-servicing.25605.1 + 15.1.200-servicing.26063.5 - 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 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 - 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 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 - 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 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 2.1.0-preview.26065.7 4.1.0-preview.26065.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e05afcd479..ddb6624ae19f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,61 +2,61 @@ - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - + https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - + https://github.com/dotnet/fsharp - 89d788641914c5d0b87fddfa11f4df0b5cfaa73d + 5d23fef87847b07b40b1b67c9d826076d7cbaf3d - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -564,9 +564,9 @@ https://github.com/microsoft/testfx f2ca2cf2507b769ba4e6609683619243588ee4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b 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..dc87e04b6c6c 100644 --- a/global.json +++ b/global.json @@ -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.25611.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25611.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 0bbf22b0168e2b745d41f48e84798f92bdcec487 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 11:17:11 -0800 Subject: [PATCH 02/14] Add GetTagHelpers method to TagHelperDescriptor --- src/RazorSdk/Tool/GenerateCommand.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index bf889875d0f7..16db788c5c6d 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -436,6 +436,7 @@ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; public IReadOnlyList GetDescriptors() => TagHelpers; + public IReadOnlyList GetTagHelpers(CancellationToken cancellationToken) => TagHelpers; } } } From 6623d93e7639a19cb6d0141d26f2a3b1687d9c01 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 15:52:26 -0800 Subject: [PATCH 03/14] Change GetTagHelpers method to return TagHelperCollection --- src/RazorSdk/Tool/GenerateCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index 16db788c5c6d..a888ca654e84 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -436,7 +436,7 @@ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; public IReadOnlyList GetDescriptors() => TagHelpers; - public IReadOnlyList GetTagHelpers(CancellationToken cancellationToken) => TagHelpers; + public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => new TagHelperCollection(TagHelpers); } } } From 5a915c06e329eaf7d35fad9bebb775f14e1aa851 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 20:36:37 -0800 Subject: [PATCH 04/14] Refactor StaticTagHelperFeature constructor and methods --- src/RazorSdk/Tool/GenerateCommand.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index a888ca654e84..2001932d89df 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -430,13 +430,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) => new TagHelperCollection(TagHelpers); + public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => tagHelpers; } } } From a963fc44cffc5e85568ea5abc2eb15f057e6095f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 20:37:36 -0800 Subject: [PATCH 05/14] Refactor tag helper registration and retrieval --- src/RazorSdk/Tool/DiscoverCommand.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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()) { From fdfdde20ebad65deb858dd87bfb21f799ba2314a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 22:17:50 -0800 Subject: [PATCH 06/14] Refactor GetTagHelpers method and improve tag helper handling --- src/RazorSdk/Tool/GenerateCommand.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index 2001932d89df..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); } } From 739bba49c0b734417f9e0c585b588ae3d8d5c38e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Jan 2026 13:07:50 -0800 Subject: [PATCH 07/14] 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 1de676196a40d3088ea7a485b368e08130cce29c Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 13 Jan 2026 11:58:55 -0800 Subject: [PATCH 08/14] 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 d452413937cdb8a36ccb0e423b88905a488cd9b5 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 14 Jan 2026 16:24:38 -0800 Subject: [PATCH 09/14] 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 c85001ddae962e852838ad3745af9acde9f6b53d Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:27:10 -0800 Subject: [PATCH 10/14] 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 a264aaaa8533abd716fbba2ea7b71177a5538ce3 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:53:09 -0800 Subject: [PATCH 11/14] 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 b6db0de18dbb23fe7c8a2e21972236a203dc049b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:41:55 -0800 Subject: [PATCH 12/14] 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 9a6cfe899cff86f392d8bf37202a75d5a45dc2ad Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:42:10 -0800 Subject: [PATCH 13/14] 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 17e74d4efc57f3121057560d44356a443afda802 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 14:32:39 -0800 Subject: [PATCH 14/14] 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")