From bd4ee3c8ca0a93f6a225abb419ca3597830ccd72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 09:10:48 +0000 Subject: [PATCH 01/11] Backflow from https://github.com/dotnet/dotnet / 4f66501 build 298387 [[ commit created by automation ]] --- eng/Versions.props | 2 +- .../src/Microsoft.CodeAnalysis.NetAnalyzers.sarif | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d144776c162c..77d0530dabd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 10 0 1 - 3 + 4 $([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0')) - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..9dd012b10c51 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,139 @@ This file should be imported by eng/Versions.props - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-preview.26070.104 - 10.0.3 - 10.0.3 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.0-preview.26071.116 + 10.0.4 + 10.0.4 18.0.11 - 18.0.11-servicing-26070-104 - 7.0.2-rc.7104 - 10.0.103 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.0-preview.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 2.0.0-preview.1.26070.104 - 2.2.3 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26070.104 - 10.0.3 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 + 18.0.11-servicing-26071-116 + 7.0.2-rc.7216 + 10.0.104 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 10.0.0-preview.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 2.0.0-preview.1.26071.116 + 2.2.4 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 14.0.104-servicing.26071.116 + 10.0.4 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26070.104 - 10.0.3-servicing.26070.104 - 18.0.1-release-26070-104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 18.0.1-release-26070-104 - 18.0.1-release-26070-104 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + 10.0.0-preview.26071.116 + 10.0.4-servicing.26071.116 + 18.0.1-release-26071-116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104-servicing.26071.116 + 10.0.104 + 10.0.104-servicing.26071.116 + 10.0.104 + 10.0.104 + 10.0.104-servicing.26071.116 + 18.0.1-release-26071-116 + 18.0.1-release-26071-116 + 3.2.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 10.0.4 + 2.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..b9173b569075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 https://github.com/microsoft/testfx @@ -569,9 +569,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 diff --git a/global.json b/global.json index c19d0b073c51..0ff5819c1c87 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26071.116", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26071.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From f3177bc04a2d48616d6908b5d95607fd79925758 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 19:44:38 +0000 Subject: [PATCH 03/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8804a76b1b4..31bd8d204991 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9dd012b10c51..6247effc52f3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.0-preview.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.0-preview.26072.113 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26071-116 - 7.0.2-rc.7216 + 18.0.11-servicing-26072-113 + 7.0.2-rc.7313 10.0.104 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 10.0.0-preview.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 2.0.0-preview.1.26071.116 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 10.0.0-preview.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 2.0.0-preview.1.26072.113 2.2.4 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26071.116 + 14.0.104-servicing.26072.113 10.0.4 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 10.0.4-servicing.26071.116 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26071.116 - 10.0.4-servicing.26071.116 - 18.0.1-release-26071-116 + 10.0.0-preview.26072.113 + 10.0.4-servicing.26072.113 + 18.0.1-release-26072-113 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26071.116 + 10.0.104-servicing.26072.113 10.0.104 - 10.0.104-servicing.26071.116 + 10.0.104-servicing.26072.113 10.0.104 10.0.104 - 10.0.104-servicing.26071.116 - 18.0.1-release-26071-116 - 18.0.1-release-26071-116 + 10.0.104-servicing.26072.113 + 18.0.1-release-26072-113 + 18.0.1-release-26072-113 3.2.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9173b569075..a79ae95e48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 diff --git a/global.json b/global.json index 0ff5819c1c87..b593c383389d 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26071.116", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26071.116", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 6d409af396222fdfea0a4d5185c0b9196fb6bbb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 22:57:53 +0000 Subject: [PATCH 04/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31bd8d204991..1dcc4e434c87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6247effc52f3..24d7f1d179f0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.0-preview.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.0-preview.26073.110 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26072-113 - 7.0.2-rc.7313 + 18.0.11-servicing-26073-110 + 7.0.2-rc.7410 10.0.104 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 10.0.0-preview.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 2.0.0-preview.1.26072.113 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 10.0.0-preview.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 2.0.0-preview.1.26073.110 2.2.4 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26072.113 + 14.0.104-servicing.26073.110 10.0.4 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 10.0.4-servicing.26072.113 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26072.113 - 10.0.4-servicing.26072.113 - 18.0.1-release-26072-113 + 10.0.0-preview.26073.110 + 10.0.4-servicing.26073.110 + 18.0.1-release-26073-110 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26072.113 + 10.0.104-servicing.26073.110 10.0.104 - 10.0.104-servicing.26072.113 + 10.0.104-servicing.26073.110 10.0.104 10.0.104 - 10.0.104-servicing.26072.113 - 18.0.1-release-26072-113 - 18.0.1-release-26072-113 + 10.0.104-servicing.26073.110 + 18.0.1-release-26073-110 + 18.0.1-release-26073-110 3.2.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a79ae95e48b4..34b63443b481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 diff --git a/global.json b/global.json index b593c383389d..7426d5cb4a79 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.110", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.110", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 79564b0c66ab10512542779206ed57df241eebd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 16:34:05 +0000 Subject: [PATCH 05/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 +++--- eng/Version.Details.xml | 392 +++++++++--------- .../core-templates/job/source-build.yml | 2 +- global.json | 4 +- 5 files changed, 263 insertions(+), 263 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dcc4e434c87..890a7c77728b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 24d7f1d179f0..9e72640a237c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.0-preview.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.0-preview.26076.104 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26073-110 - 7.0.2-rc.7410 + 18.0.11-servicing-26076-104 + 7.0.2-rc.7704 10.0.104 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 10.0.0-preview.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 2.0.0-preview.1.26073.110 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 10.0.0-preview.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 2.0.0-preview.1.26076.104 2.2.4 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26073.110 + 14.0.104-servicing.26076.104 10.0.4 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 10.0.4-servicing.26073.110 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26073.110 - 10.0.4-servicing.26073.110 - 18.0.1-release-26073-110 + 10.0.0-preview.26076.104 + 10.0.4-servicing.26076.104 + 18.0.1-release-26076-104 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26073.110 + 10.0.104-servicing.26076.104 10.0.104 - 10.0.104-servicing.26073.110 + 10.0.104-servicing.26076.104 10.0.104 10.0.104 - 10.0.104-servicing.26073.110 - 18.0.1-release-26073-110 - 18.0.1-release-26073-110 + 10.0.104-servicing.26076.104 + 18.0.1-release-26076-104 + 18.0.1-release-26076-104 3.2.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b63443b481..33ad381b5acc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb94..c08b3ad8ad03 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index 7426d5cb4a79..512c3e5ace79 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.110", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 3ea21daeaaf24a74411c3b6eb3e5ecb88b6233dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 00:12:53 +0000 Subject: [PATCH 06/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 890a7c77728b..e3831295c699 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9e72640a237c..290d723cfc91 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.0-preview.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.0-preview.26076.112 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26076-104 - 7.0.2-rc.7704 + 18.0.11-servicing-26076-112 + 7.0.2-rc.7712 10.0.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 10.0.0-preview.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 2.0.0-preview.1.26076.104 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 10.0.0-preview.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 2.0.0-preview.1.26076.112 2.2.4 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26076.104 + 14.0.104-servicing.26076.112 10.0.4 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 10.0.4-servicing.26076.104 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.104 - 10.0.4-servicing.26076.104 - 18.0.1-release-26076-104 + 10.0.0-preview.26076.112 + 10.0.4-servicing.26076.112 + 18.0.1-release-26076-112 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26076.104 + 10.0.104-servicing.26076.112 10.0.104 - 10.0.104-servicing.26076.104 + 10.0.104-servicing.26076.112 10.0.104 10.0.104 - 10.0.104-servicing.26076.104 - 18.0.1-release-26076-104 - 18.0.1-release-26076-104 + 10.0.104-servicing.26076.112 + 18.0.1-release-26076-112 + 18.0.1-release-26076-112 3.2.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33ad381b5acc..2ab4f7cba418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b diff --git a/global.json b/global.json index 512c3e5ace79..9d8a6306abfe 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.112", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.112", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 8af133d64173cc4c3af5905f6eecac22008ebbc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 17:10:48 +0000 Subject: [PATCH 07/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3831295c699..d7ab59db215a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 290d723cfc91..fb5a4dc8b4b1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.0-preview.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.0-preview.26077.101 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26076-112 - 7.0.2-rc.7712 + 18.0.11-servicing-26077-101 + 7.0.2-rc.7801 10.0.104 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 10.0.0-preview.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 2.0.0-preview.1.26076.112 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 10.0.0-preview.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 2.0.0-preview.1.26077.101 2.2.4 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26076.112 + 14.0.104-servicing.26077.101 10.0.4 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 10.0.4-servicing.26076.112 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.112 - 10.0.4-servicing.26076.112 - 18.0.1-release-26076-112 + 10.0.0-preview.26077.101 + 10.0.4-servicing.26077.101 + 18.0.1-release-26077-101 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26076.112 + 10.0.104-servicing.26077.101 10.0.104 - 10.0.104-servicing.26076.112 + 10.0.104-servicing.26077.101 10.0.104 10.0.104 - 10.0.104-servicing.26076.112 - 18.0.1-release-26076-112 - 18.0.1-release-26076-112 + 10.0.104-servicing.26077.101 + 18.0.1-release-26077-101 + 18.0.1-release-26077-101 3.2.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab4f7cba418..99effa0a3a8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 diff --git a/global.json b/global.json index 9d8a6306abfe..aebbf7f47142 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.112", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.112", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 27df5c71bc86e7e50f049bcdf7ceb918fe074164 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 27 Jan 2026 12:59:00 -0800 Subject: [PATCH 08/11] `workload repair` can recover from corrupt workload sets (#52434) Co-authored-by: Marc Paine --- .../dotnet/Commands/CliCommandStrings.resx | 58 +++++---- .../Workload/Install/FileBasedInstaller.cs | 3 +- .../Install/WorkloadInstallerFactory.cs | 22 +++- .../Workload/Repair/WorkloadRepairCommand.cs | 6 +- .../Workload/WorkloadHistoryRecorder.cs | 4 + .../WorkloadManifestCorruptionRepairer.cs | 121 ++++++++++++++++++ .../Commands/xlf/CliCommandStrings.cs.xlf | 5 + .../Commands/xlf/CliCommandStrings.de.xlf | 5 + .../Commands/xlf/CliCommandStrings.es.xlf | 5 + .../Commands/xlf/CliCommandStrings.fr.xlf | 5 + .../Commands/xlf/CliCommandStrings.it.xlf | 5 + .../Commands/xlf/CliCommandStrings.ja.xlf | 5 + .../Commands/xlf/CliCommandStrings.ko.xlf | 5 + .../Commands/xlf/CliCommandStrings.pl.xlf | 5 + .../Commands/xlf/CliCommandStrings.pt-BR.xlf | 5 + .../Commands/xlf/CliCommandStrings.ru.xlf | 5 + .../Commands/xlf/CliCommandStrings.tr.xlf | 5 + .../xlf/CliCommandStrings.zh-Hans.xlf | 5 + .../xlf/CliCommandStrings.zh-Hant.xlf | 5 + .../IWorkloadManifestCorruptionRepairer.cs | 18 +++ .../IWorkloadManifestProvider.cs | 24 ++++ .../SdkDirectoryWorkloadManifestProvider.cs | 71 +++++++++- .../Strings.resx | 58 +++++---- .../xlf/Strings.cs.xlf | 5 + .../xlf/Strings.de.xlf | 5 + .../xlf/Strings.es.xlf | 5 + .../xlf/Strings.fr.xlf | 5 + .../xlf/Strings.it.xlf | 5 + .../xlf/Strings.ja.xlf | 5 + .../xlf/Strings.ko.xlf | 5 + .../xlf/Strings.pl.xlf | 5 + .../xlf/Strings.pt-BR.xlf | 5 + .../xlf/Strings.ru.xlf | 5 + .../xlf/Strings.tr.xlf | 5 + .../xlf/Strings.zh-Hans.xlf | 5 + .../xlf/Strings.zh-Hant.xlf | 5 + ...kDirectoryWorkloadManifestProviderTests.cs | 6 +- .../Install/CorruptWorkloadSetTestHelper.cs | 114 +++++++++++++++++ .../Install/MockPackWorkloadInstaller.cs | 28 +++- .../Repair/GivenDotnetWorkloadRepair.cs | 45 ++++++- .../Restore/GivenDotnetWorkloadRestore.cs | 4 +- .../Workload/Search/MockWorkloadResolver.cs | 8 +- .../Update/GivenDotnetWorkloadUpdate.cs | 62 ++++++++- 43 files changed, 709 insertions(+), 73 deletions(-) create mode 100644 src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs create mode 100644 src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs create mode 100644 test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx index 74001a13dfe9..d34d4f76f184 100644 --- a/src/Cli/dotnet/Commands/CliCommandStrings.resx +++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx @@ -1,17 +1,17 @@  - @@ -2724,4 +2724,8 @@ Proceed? duration: + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + diff --git a/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs b/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs index 99681825c16f..9328fd2f9f32 100644 --- a/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Text.Json; +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.Commands.Workload.Config; using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords; using Microsoft.DotNet.Cli.Extensions; @@ -642,7 +643,7 @@ public IEnumerable GetWorkloadHistoryRecords(string sdkFe public void Shutdown() { // Perform any additional cleanup here that's intended to run at the end of the command, regardless - // of success or failure. For file based installs, there shouldn't be any additional work to + // of success or failure. For file based installs, there shouldn't be any additional work to // perform. } diff --git a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs index 6ad1553257f2..e260bfa90fa7 100644 --- a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs +++ b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs @@ -3,6 +3,7 @@ #nullable disable +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; @@ -48,7 +49,7 @@ public static IInstaller GetWorkloadInstaller( userProfileDir ??= CliFolderPathCalculator.DotnetUserProfileFolderPath; - return new FileBasedInstaller( + var installer = new FileBasedInstaller( reporter, sdkFeatureBand, workloadResolver, @@ -59,6 +60,25 @@ public static IInstaller GetWorkloadInstaller( verbosity: verbosity, packageSourceLocation: packageSourceLocation, restoreActionConfig: restoreActionConfig); + + // Attach corruption repairer to recover from corrupt workload sets + if (nugetPackageDownloader is not null && + workloadResolver?.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider && + sdkProvider.CorruptionRepairer is null) + { + sdkProvider.CorruptionRepairer = new WorkloadManifestCorruptionRepairer( + reporter, + installer, + workloadResolver, + sdkFeatureBand, + dotnetDir, + userProfileDir, + nugetPackageDownloader, + packageSourceLocation, + verbosity); + } + + return installer; } private static bool CanWriteToDotnetRoot(string dotnetDir = null) diff --git a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs index 46fee7742ebb..7712399f3eee 100644 --- a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs +++ b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs @@ -69,7 +69,8 @@ public override int Execute() { Reporter.WriteLine(); - var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(new SdkFeatureBand(_sdkVersion)); + var sdkFeatureBand = new SdkFeatureBand(_sdkVersion); + var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(sdkFeatureBand); if (!workloadIds.Any()) { @@ -79,7 +80,7 @@ public override int Execute() Reporter.WriteLine(string.Format(CliCommandStrings.RepairingWorkloads, string.Join(" ", workloadIds))); - ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, new SdkFeatureBand(_sdkVersion)); + ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, sdkFeatureBand); WorkloadInstallCommand.TryRunGarbageCollection(_workloadInstaller, Reporter, Verbosity, workloadSetVersion => _workloadResolverFactory.CreateForWorkloadSet(_dotnetPath, _sdkVersion.ToString(), _userProfileDir, workloadSetVersion)); @@ -105,4 +106,5 @@ private void ReinstallWorkloadsBasedOnCurrentManifests(IEnumerable w { _workloadInstaller.RepairWorkloads(workloadIds, sdkFeatureBand); } + } diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs b/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs index ab64b7539912..0690f5e12347 100644 --- a/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs +++ b/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs @@ -54,6 +54,10 @@ public void Run(Action workloadAction) private WorkloadHistoryState GetWorkloadState() { var resolver = _workloadResolverFunc(); + if (resolver.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider) + { + sdkProvider.CorruptionFailureMode = ManifestCorruptionFailureMode.Ignore; + } var currentWorkloadVersion = resolver.GetWorkloadVersion().Version; return new WorkloadHistoryState() { diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs b/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs new file mode 100644 index 000000000000..28bfe766a5f0 --- /dev/null +++ b/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs @@ -0,0 +1,121 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics.CodeAnalysis; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Commands.Workload.Install; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.Cli.Commands.Workload; + +internal sealed class WorkloadManifestCorruptionRepairer : IWorkloadManifestCorruptionRepairer +{ + private readonly IReporter _reporter; + private readonly IInstaller _workloadInstaller; + private readonly IWorkloadResolver _workloadResolver; + private readonly SdkFeatureBand _sdkFeatureBand; + private readonly string _dotnetPath; + private readonly string _userProfileDir; + private readonly INuGetPackageDownloader? _packageDownloader; + private readonly PackageSourceLocation? _packageSourceLocation; + private readonly VerbosityOptions _verbosity; + + private bool _checked; + + public WorkloadManifestCorruptionRepairer( + IReporter reporter, + IInstaller workloadInstaller, + IWorkloadResolver workloadResolver, + SdkFeatureBand sdkFeatureBand, + string dotnetPath, + string userProfileDir, + INuGetPackageDownloader? packageDownloader, + PackageSourceLocation? packageSourceLocation, + VerbosityOptions verbosity) + { + _reporter = reporter ?? NullReporter.Instance; + _workloadInstaller = workloadInstaller; + _workloadResolver = workloadResolver; + _sdkFeatureBand = sdkFeatureBand; + _dotnetPath = dotnetPath; + _userProfileDir = userProfileDir; + _packageDownloader = packageDownloader; + _packageSourceLocation = packageSourceLocation; + _verbosity = verbosity; + } + + public void EnsureManifestsHealthy(ManifestCorruptionFailureMode failureMode) + { + if (_checked) + { + return; + } + + _checked = true; + + if (failureMode == ManifestCorruptionFailureMode.Ignore) + { + return; + } + + // Get the workload set directly from the provider - it was already resolved during construction + // and doesn't require reading the install state file again + var provider = _workloadResolver.GetWorkloadManifestProvider() as SdkDirectoryWorkloadManifestProvider; + var workloadSet = provider?.ResolvedWorkloadSet; + + if (workloadSet is null) + { + // No workload set is being used + return; + } + + if (!provider?.HasMissingManifests(workloadSet) ?? true) + { + return; + } + + if (failureMode == ManifestCorruptionFailureMode.Throw) + { + throw new InvalidOperationException(string.Format(CliCommandStrings.WorkloadSetHasMissingManifests, workloadSet.Version)); + } + + _reporter.WriteLine($"Repairing workload set {workloadSet.Version}..."); + CliTransaction.RunNew(context => RepairCorruptWorkloadSet(context, workloadSet)); + } + + + + private void RepairCorruptWorkloadSet(ITransactionContext context, WorkloadSet workloadSet) + { + var manifestUpdates = CreateManifestUpdatesFromWorkloadSet(workloadSet); + + foreach (var manifestUpdate in manifestUpdates) + { + _workloadInstaller.InstallWorkloadManifest(manifestUpdate, context); + } + + } + + [MemberNotNull(nameof(_packageDownloader))] + private IEnumerable CreateManifestUpdatesFromWorkloadSet(WorkloadSet workloadSet) + { + if (_packageDownloader is null) + { + throw new InvalidOperationException("Package downloader is required to repair workload manifests."); + } + + var manifestUpdater = new WorkloadManifestUpdater( + _reporter, + _workloadResolver, + _packageDownloader, + _userProfileDir, + _workloadInstaller.GetWorkloadInstallationRecordRepository(), + _workloadInstaller, + _packageSourceLocation, + displayManifestUpdates: _verbosity >= VerbosityOptions.detailed); + + return manifestUpdater.CalculateManifestUpdatesForWorkloadSet(workloadSet); + } +} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 69f0ea0788e1..1512b9be7de3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -4074,6 +4074,11 @@ Pokud chcete zobrazit hodnotu, zadejte odpovídající volbu příkazového řá Verze {0} úlohy, která byla zadána v {1}, nebyla nalezena. Spuštěním příkazu dotnet workload restore nainstalujte tuto verzi úlohy. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Verze úlohy, která se má zobrazit, nebo jedna nebo více úloh a jejich verze spojené znakem @. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index e3a05f3c7545..6648f17aedbe 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -4074,6 +4074,11 @@ Um einen Wert anzuzeigen, geben Sie die entsprechende Befehlszeilenoption an, oh Die Arbeitsauslastungsversion {0}, die in {1} angegeben wurde, wurde nicht gefunden. Führen Sie „dotnet workload restore“ aus, um diese Workloadversion zu installieren. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Eine Workloadversion zum Anzeigen oder mindestens eine Workload und deren Versionen, die mit dem Zeichen "@" verknüpft sind. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 82aa42c23b79..93d84a383f4e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -4074,6 +4074,11 @@ Para mostrar un valor, especifique la opción de línea de comandos correspondie No se encontró la versión de carga de trabajo {0}, que se especificó en {1}. Ejecuta "dotnet workload restore" para instalar esta versión de carga de trabajo. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Una versión de carga de trabajo para mostrar o una o varias cargas de trabajo y sus versiones unidas por el carácter "@". diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index b6da938fbb90..b2524264859d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -4074,6 +4074,11 @@ Pour afficher une valeur, spécifiez l’option de ligne de commande corresponda La version de charge de travail {0}, qui a été spécifiée dans {1}, est introuvable. Exécutez « dotnet workload restore » pour installer cette version de charge de travail. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Version de charge de travail à afficher ou une ou plusieurs charges de travail et leurs versions jointes par le caractère « @ ». diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index d8ded9eb3783..512bf4612264 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -4074,6 +4074,11 @@ Per visualizzare un valore, specifica l'opzione della riga di comando corrispond La versione del carico di lavoro {0}, specificata in {1}, non è stata trovata. Eseguire "dotnet workload restore" per installare questa versione del carico di lavoro. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Una versione del carico di lavoro da visualizzare oppure uno o più carichi di lavoro e le relative versioni unite dal carattere '@'. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index 373d63a6721b..aa044bf2b8c3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid {1} で指定されたワークロード バージョン {0} が見つかりませんでした。"dotnet workload restore" を実行して、このワークロード バージョンをインストールします。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 表示するワークロードのバージョン、または '@' 文字で結合された 1 つ以上のワークロードとそのバージョン。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index 6935ae03eb40..7290a2610e18 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid {1}에 지정된 워크로드 버전 {0}을(를) 찾을 수 없습니다. "dotnet workload restore"을 실행하여 이 워크로드 버전을 설치합니다. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 표시할 워크로드 버전 또는 '@' 문자로 결합된 하나 이상의 워크로드와 해당 버전입니다. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 952dc2ec304c..5ef1ec80a17e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -4074,6 +4074,11 @@ Aby wyświetlić wartość, należy podać odpowiednią opcję wiersza poleceń Nie znaleziono wersji obciążenia {0} określonej w kontenerze {1}. Uruchom polecenie „dotnet workload restore”, aby zainstalować tę wersję obciążenia. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Wersja obciążenia do wyświetlenia lub jedno lub więcej obciążeń i ich wersji połączonych znakiem „@”. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index c0d1afd99daf..0e7a0f908f2b 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -4074,6 +4074,11 @@ Para exibir um valor, especifique a opção de linha de comando correspondente s A versão da carga de trabalho {0}, especificada em {1}, não foi localizada. Execute "dotnet workload restore" para instalar esta versão da carga de trabalho. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Uma versão de carga de trabalho para exibir ou uma ou mais cargas de trabalho e suas versões unidas pelo caractere ''@''. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index e0611a0d0423..cfb075bb07df 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -4075,6 +4075,11 @@ To display a value, specify the corresponding command-line option without provid Версия рабочей нагрузки {0}, указанная в {1}, не найдена. Запустите команду "dotnet workload restore", чтобы установить эту версию рабочей нагрузки. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Версия рабочей нагрузки для отображения или одной или нескольких рабочих нагрузок и их версий, соединенных символом "@". diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index 24d365bdb0e0..195553f39fa9 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -4074,6 +4074,11 @@ Bir değeri görüntülemek için, bir değer sağlamadan ilgili komut satırı {1} konumunda belirtilen {0} iş yükü sürümü bulunamadı. Bu iş yükü sürümünü yüklemek için "dotnet workload restore" komutunu çalıştırın. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Görüntülenecek bir iş yükü sürümü veya bir veya daha fazla iş yükü ve bunların '@' karakteriyle birleştirilen sürümleri. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index f5d749e1d50d..a9bf482bb05e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid 找不到在 {1} 中指定的工作负载版本 {0}。运行“dotnet workload restore”以安装此工作负载版本。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 要显示的工作负载版本,或一个或多个工作负载,并且其版本由 ‘@’ 字符联接。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 93e2b84eaee7..39969f14662e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid 找不到 {1} 中指定的工作負載版本 {0}。執行 "dotnet workload restore" 以安裝此工作負載版本。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 要顯示的工作負載版本,或是一或多個工作負載及其由 '@' 字元連接的版本。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs new file mode 100644 index 000000000000..4c3a9e907ba9 --- /dev/null +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.NET.Sdk.WorkloadManifestReader +{ + /// + /// Provides a hook for the CLI layer to detect and repair corrupt workload manifest installations + /// before the manifests are loaded by the resolver. + /// + public interface IWorkloadManifestCorruptionRepairer + { + /// + /// Ensures that the manifests required by the current resolver are present and healthy. + /// + /// How to handle corruption if detected. + void EnsureManifestsHealthy(ManifestCorruptionFailureMode failureMode); + } +} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs index 4a2df9d5ecaa..887b170fcd04 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs @@ -3,6 +3,30 @@ namespace Microsoft.NET.Sdk.WorkloadManifestReader { + /// + /// Specifies how the manifest provider should handle corrupt or missing workload manifests. + /// + public enum ManifestCorruptionFailureMode + { + /// + /// Attempt to repair using the CorruptionRepairer if available, otherwise throw. + /// This is the default mode for commands that modify workloads. + /// + Repair, + + /// + /// Throw a helpful error message suggesting how to fix the issue. + /// Use this for read-only/info commands. + /// + Throw, + + /// + /// Silently ignore missing manifests and continue. + /// Use this for history recording or other scenarios where missing manifests are acceptable. + /// + Ignore + } + /// /// This abstracts out the process of locating and loading a set of manifests to be loaded into a /// workload manifest resolver and resolved into a single coherent model. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index c3da2743abc3..7329564dd6bf 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -6,6 +6,7 @@ using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.NET.Sdk.Localization; +using Microsoft.DotNet.Cli.Commands; using static Microsoft.NET.Sdk.WorkloadManifestReader.IWorkloadManifestProvider; namespace Microsoft.NET.Sdk.WorkloadManifestReader @@ -31,6 +32,24 @@ public partial class SdkDirectoryWorkloadManifestProvider : IWorkloadManifestPro private bool _useManifestsFromInstallState = true; private bool? _globalJsonSpecifiedWorkloadSets = null; + /// + /// Optional hook that allows the CLI to ensure workload manifests are available (and repaired if necessary) + /// before this provider attempts to enumerate them. + /// + public IWorkloadManifestCorruptionRepairer? CorruptionRepairer { get; set; } + + /// + /// Specifies how this provider should handle corrupt or missing workload manifests. + /// Default is . + /// + public ManifestCorruptionFailureMode CorruptionFailureMode { get; set; } = ManifestCorruptionFailureMode.Repair; + + /// + /// Gets the resolved workload set, if any. This is populated during construction/refresh + /// and does not trigger corruption checking. + /// + public WorkloadSet? ResolvedWorkloadSet => _workloadSet; + // This will be non-null if there is an error loading manifests that should be thrown when they need to be accessed. // We delay throwing the error so that in the case where global.json specifies a workload set that isn't installed, // we can successfully construct a resolver and install that workload set @@ -247,6 +266,19 @@ void ThrowExceptionIfManifestsNotAvailable() public WorkloadVersionInfo GetWorkloadVersion() { + if (CorruptionRepairer != null) + { + CorruptionRepairer.EnsureManifestsHealthy(CorruptionFailureMode); + } + else if (_workloadSet != null && CorruptionFailureMode != ManifestCorruptionFailureMode.Ignore) + { + // No repairer attached - check for missing manifests and throw a helpful error + if (HasMissingManifests(_workloadSet)) + { + throw new InvalidOperationException(string.Format(Strings.WorkloadSetHasMissingManifests, _workloadSet.Version)); + } + } + if (_globalJsonWorkloadSetVersion != null) { // _exceptionToThrow is set to null here if and only if the workload set is not installed. @@ -290,6 +322,18 @@ public WorkloadVersionInfo GetWorkloadVersion() public IEnumerable GetManifests() { + if (CorruptionRepairer != null) + { + CorruptionRepairer.EnsureManifestsHealthy(CorruptionFailureMode); + } + else if (_workloadSet != null && CorruptionFailureMode != ManifestCorruptionFailureMode.Ignore) + { + // No repairer attached - check for missing manifests and throw a helpful error + if (HasMissingManifests(_workloadSet)) + { + throw new InvalidOperationException(string.Format(Strings.WorkloadSetHasMissingManifests, _workloadSet.Version)); + } + } ThrowExceptionIfManifestsNotAvailable(); // Scan manifest directories @@ -363,6 +407,10 @@ void ProbeDirectory(string manifestDirectory, string featureBand) var manifestDirectory = GetManifestDirectoryFromSpecifier(manifestSpecifier); if (manifestDirectory == null) { + if (CorruptionFailureMode == ManifestCorruptionFailureMode.Ignore) + { + continue; + } throw new FileNotFoundException(string.Format(Strings.ManifestFromWorkloadSetNotFound, manifestSpecifier.ToString(), _workloadSet.Version)); } AddManifest(manifestSpecifier.Id.ToString(), manifestDirectory, manifestSpecifier.FeatureBand.ToString(), kvp.Value.Version.ToString()); @@ -380,6 +428,10 @@ void ProbeDirectory(string manifestDirectory, string featureBand) var manifestDirectory = GetManifestDirectoryFromSpecifier(manifestSpecifier); if (manifestDirectory == null) { + if (CorruptionFailureMode == ManifestCorruptionFailureMode.Ignore) + { + continue; + } throw new FileNotFoundException(string.Format(Strings.ManifestFromInstallStateNotFound, manifestSpecifier.ToString(), _installStateFilePath)); } AddManifest(manifestSpecifier.Id.ToString(), manifestDirectory, manifestSpecifier.FeatureBand.ToString(), kvp.Value.Version.ToString()); @@ -510,6 +562,23 @@ void ProbeDirectory(string manifestDirectory, string featureBand) return null; } + /// + /// Checks if the workload set has any manifests that are missing from disk. + /// This checks all manifest roots (including user-local installs). + /// + public bool HasMissingManifests(WorkloadSet workloadSet) + { + foreach (var manifestEntry in workloadSet.ManifestVersions) + { + var manifestSpecifier = new ManifestSpecifier(manifestEntry.Key, manifestEntry.Value.Version, manifestEntry.Value.FeatureBand); + if (GetManifestDirectoryFromSpecifier(manifestSpecifier) == null) + { + return true; + } + } + return false; + } + /// /// Returns installed workload sets that are available for this SDK (ie are in the same feature band) /// @@ -538,7 +607,7 @@ Dictionary GetAvailableWorkloadSetsInternal(SdkFeatureBand? } else { - // Get workload sets for all feature bands + // Get workload sets for all feature bands foreach (var featureBandDirectory in Directory.GetDirectories(manifestRoot)) { AddWorkloadSetsForFeatureBand(availableWorkloadSets, featureBandDirectory); diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx index cf418daa75cb..e583daad115c 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx @@ -1,17 +1,17 @@  - @@ -213,5 +213,9 @@ No manifest with ID {0} exists. + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf index 1891cc4ff30b..e52c35088d8a 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf @@ -142,6 +142,11 @@ Nevyřešený cíl {0} pro přesměrování úlohy {1} v manifestu {2} [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Verze {0} úlohy, která byla zadána v {1}, nebyla nalezena. Spuštěním příkazu dotnet workload restore nainstalujte tuto verzi úlohy. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf index aa35c3838c22..c1b3de9e9b04 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf @@ -142,6 +142,11 @@ Nicht aufgelöstes Ziel „{0}“ für die Workloadumleitung „{1}“ im Manifest „{2}“ [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Die Arbeitsauslastungsversion {0}, die in {1} angegeben wurde, wurde nicht gefunden. Führen Sie „dotnet workload restore“ aus, um diese Workloadversion zu installieren. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf index 485e6e0a0cf8..91127d3307bf 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf @@ -142,6 +142,11 @@ Destino sin resolver '{0}' para redirección de carga de trabajo '{1}' en el manifiesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. No se encontró la versión de carga de trabajo {0}, que se especificó en {1}. Ejecuta "dotnet workload restore" para instalar esta versión de carga de trabajo. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf index 0ae7f6800bd3..550221d36e00 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf @@ -142,6 +142,11 @@ Cible non résolue « {0} » pour la redirection de charge de travail « {1} » dans le manifeste « {2} » [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. La version de charge de travail {0}, qui a été spécifiée dans {1}, est introuvable. Exécutez « dotnet workload restore » pour installer cette version de charge de travail. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf index 7c666799e412..b2124effaba4 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf @@ -142,6 +142,11 @@ Destinazione non risolta '{0}' per il reindirizzamento del carico di lavoro '{1}' nel manifesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. La versione del carico di lavoro {0}, specificata in {1}, non è stata trovata. Eseguire "dotnet workload restore" per installare questa versione del carico di lavoro. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf index cc172807eaa9..5254999963fa 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf @@ -142,6 +142,11 @@ マニフェスト '{2}' [{3}] 内のワークロード リダイレクト '{1}' に対する未解決のターゲット '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1} で指定されたワークロード バージョン {0} が見つかりませんでした。"dotnet workload restore" を実行して、このワークロード バージョンをインストールします。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf index 385531b1c48b..06a3d8b1e20b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf @@ -142,6 +142,11 @@ 매니페스트 '{2}' [{3}]의 워크로드 리디렉션 '{1}'에 대한 확인되지 않는 대상 '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1}에 지정된 워크로드 버전 {0}을(를) 찾을 수 없습니다. "dotnet workload restore"을 실행하여 이 워크로드 버전을 설치합니다. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf index 2f5dc549ddf0..2fb7cda88a37 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf @@ -142,6 +142,11 @@ Nierozpoznany element docelowy „{0}” przekierowania obciążenia „{1}” w manifeście „{2}” [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Nie znaleziono wersji obciążenia {0} określonej w kontenerze {1}. Uruchom polecenie „dotnet workload restore”, aby zainstalować tę wersję obciążenia. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf index f5f0331a25ec..19aa8c2b6001 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf @@ -142,6 +142,11 @@ Destino '{0}' não resolvido para o redirecionamento de carga de trabalho '{1}' no manifesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. A versão da carga de trabalho {0}, especificada em {1}, não foi localizada. Execute "dotnet workload restore" para instalar esta versão da carga de trabalho. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf index bf88a6af7bbe..01bf7048e135 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf @@ -142,6 +142,11 @@ Неразрешенный целевой объект "{0}" для перенаправления рабочей нагрузки "{1}" в манифесте "{2}" [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Версия рабочей нагрузки {0}, указанная в {1}, не найдена. Запустите команду "dotnet workload restore", чтобы установить эту версию рабочей нагрузки. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf index 786f001a3435..15e1e6425967 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf @@ -142,6 +142,11 @@ '{2}' [{3}] bildirimindeki '{1}' iş akışı yeniden yönlendirmesi için '{0}' hedefi çözümlenemedi + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1} konumunda belirtilen {0} iş yükü sürümü bulunamadı. Bu iş yükü sürümünü yüklemek için "dotnet workload restore" komutunu çalıştırın. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf index 911a2731d284..5770b450720b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf @@ -142,6 +142,11 @@ 工作负载未解析的目标“{0}”重定向到清单“{2}”[{3}] 中的“{1}” + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. 找不到在 {1} 中指定的工作负载版本 {0}。运行“dotnet workload restore”以安装此工作负载版本。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf index 423e6216ecca..2435cecf1b39 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf @@ -142,6 +142,11 @@ 資訊清單 '{2}' [{3}] 中工作負載重新導向 '{1}' 的未解析目標 '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. 找不到 {1} 中指定的工作負載版本 {0}。執行 "dotnet workload restore" 以安裝此工作負載版本。 diff --git a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs index cbb52e8040c1..7ad32c244356 100644 --- a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs +++ b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs @@ -436,7 +436,7 @@ public void ItThrowsIfManifestFromWorkloadSetIsNotFound() var sdkDirectoryWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.200", userProfileDir: null, globalJsonPath: null); - Assert.Throws(() => GetManifestContents(sdkDirectoryWorkloadManifestProvider).ToList()); + Assert.Throws(() => GetManifestContents(sdkDirectoryWorkloadManifestProvider).ToList()); } [Fact] @@ -710,9 +710,9 @@ public void ItFailsIfManifestFromWorkloadSetFromInstallStateIsNotInstalled() var sdkDirectoryWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.200", userProfileDir: null, globalJsonPath: null); - var ex = Assert.Throws(() => sdkDirectoryWorkloadManifestProvider.GetManifests().ToList()); + var ex = Assert.Throws(() => sdkDirectoryWorkloadManifestProvider.GetManifests().ToList()); - ex.Message.Should().Be(string.Format(Strings.ManifestFromWorkloadSetNotFound, "ios: 11.0.2/8.0.100", "8.0.201")); + ex.Message.Should().Be(string.Format(Strings.WorkloadSetHasMissingManifests, "8.0.201")); } [Fact] diff --git a/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs b/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs new file mode 100644 index 000000000000..e42c4ea223cd --- /dev/null +++ b/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs @@ -0,0 +1,114 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using ManifestReaderTests; +using Microsoft.DotNet.Cli.Commands.Workload; +using Microsoft.DotNet.Cli.Commands.Workload.Install; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.Cli.Workload.Install.Tests +{ + /// + /// Test helper for setting up corrupt workload set scenarios. + /// + internal static class CorruptWorkloadSetTestHelper + { + /// + /// Sets up a corrupt workload set scenario where manifests are missing but workload set is configured. + /// This simulates package managers deleting manifests during SDK updates. + /// Returns a real SdkDirectoryWorkloadManifestProvider so the corruption repairer can be attached. + /// + public static (string dotnetRoot, string userProfileDir, MockPackWorkloadInstaller mockInstaller, IWorkloadResolver workloadResolver, SdkDirectoryWorkloadManifestProvider manifestProvider) + SetupCorruptWorkloadSet( + TestAssetsManager testAssetsManager, + bool userLocal, + out string sdkFeatureVersion) + { + var testDirectory = testAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path; + var dotnetRoot = Path.Combine(testDirectory, "dotnet"); + var userProfileDir = Path.Combine(testDirectory, "user-profile"); + sdkFeatureVersion = "6.0.100"; + var workloadSetVersion = "6.0.100"; + + // Create workload set contents JSON for the current (corrupt) version + var workloadSetJson = """ +{ + "xamarin-android-build": "8.4.7/6.0.100", + "xamarin-ios-sdk": "10.0.1/6.0.100" +} +"""; + + // Create workload set contents for the updated version + var workloadSetJsonUpdated = """ +{ + "xamarin-android-build": "8.4.8/6.0.100", + "xamarin-ios-sdk": "10.0.2/6.0.100" +} +"""; + + // Create workload set contents for the mock installer + var workloadSetContents = new Dictionary + { + [workloadSetVersion] = workloadSetJson, + ["6.0.101"] = workloadSetJsonUpdated + }; + + // Set up mock installer with workload set support + // Note: Don't pre-populate installedWorkloads - the test focuses on manifest repair, not workload installation + var mockInstaller = new MockPackWorkloadInstaller( + dotnetDir: dotnetRoot, + installedWorkloads: new List(), + workloadSetContents: workloadSetContents); + + string installRoot = userLocal ? userProfileDir : dotnetRoot; + if (userLocal) + { + WorkloadFileBasedInstall.SetUserLocal(dotnetRoot, sdkFeatureVersion); + } + + // Create install state with workload set version + var installStateDir = Path.Combine(installRoot, "metadata", "workloads", RuntimeInformation.ProcessArchitecture.ToString(), sdkFeatureVersion, "InstallState"); + Directory.CreateDirectory(installStateDir); + var installStatePath = Path.Combine(installStateDir, "default.json"); + var installState = new InstallStateContents + { + UseWorkloadSets = true, + WorkloadVersion = workloadSetVersion, + Manifests = new Dictionary + { + ["xamarin-android-build"] = "8.4.7", + ["xamarin-ios-sdk"] = "10.0.1" + } + }; + File.WriteAllText(installStatePath, installState.ToString()); + + // Create workload set folder so the real provider can find it + var workloadSetsRoot = Path.Combine(dotnetRoot, "sdk-manifests", sdkFeatureVersion, "workloadsets", workloadSetVersion); + Directory.CreateDirectory(workloadSetsRoot); + File.WriteAllText(Path.Combine(workloadSetsRoot, "workloadset.workloadset.json"), workloadSetJson); + + // Create mock manifest directories but WITHOUT manifest files to simulate ruined install + var manifestRoot = Path.Combine(dotnetRoot, "sdk-manifests", sdkFeatureVersion); + var androidManifestDir = Path.Combine(manifestRoot, "xamarin-android-build", "8.4.7"); + var iosManifestDir = Path.Combine(manifestRoot, "xamarin-ios-sdk", "10.0.1"); + Directory.CreateDirectory(androidManifestDir); + Directory.CreateDirectory(iosManifestDir); + + // Verify manifests don't exist (simulating the ruined install) + if (File.Exists(Path.Combine(androidManifestDir, "WorkloadManifest.json")) || + File.Exists(Path.Combine(iosManifestDir, "WorkloadManifest.json"))) + { + throw new InvalidOperationException("Test setup failed: manifest files should not exist"); + } + + // Create a real SdkDirectoryWorkloadManifestProvider + var manifestProvider = new SdkDirectoryWorkloadManifestProvider(dotnetRoot, sdkFeatureVersion, userProfileDir, globalJsonPath: null); + var workloadResolver = WorkloadResolver.Create(manifestProvider, dotnetRoot, sdkFeatureVersion, userProfileDir); + mockInstaller.WorkloadResolver = workloadResolver; + + return (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider); + } + } +} diff --git a/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs b/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs index c1e7354d9d21..9c7bed6b7e9a 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs @@ -139,7 +139,11 @@ public IEnumerable GetWorkloadHistoryRecords(string sdkFe return HistoryRecords; } - public void RepairWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, DirectoryPath? offlineCache = null) => throw new NotImplementedException(); + public void RepairWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, DirectoryPath? offlineCache = null) + { + // Repair is essentially a reinstall of existing workloads + CliTransaction.RunNew(context => InstallWorkloads(workloadIds, sdkFeatureBand, context, offlineCache)); + } public void GarbageCollect(Func getResolverForWorkloadSet, DirectoryPath? offlineCache = null, bool cleanAllPacks = false) { @@ -160,6 +164,28 @@ public IWorkloadInstallationRecordRepository GetWorkloadInstallationRecordReposi public void InstallWorkloadManifest(ManifestVersionUpdate manifestUpdate, ITransactionContext transactionContext, DirectoryPath? offlineCache = null) { InstalledManifests.Add((manifestUpdate, offlineCache)); + + // Also create the actual manifest file on disk so that SdkDirectoryWorkloadManifestProvider can find it + if (_dotnetDir != null) + { + var manifestDir = Path.Combine(_dotnetDir, "sdk-manifests", manifestUpdate.NewFeatureBand, + manifestUpdate.ManifestId.ToString(), manifestUpdate.NewVersion.ToString()); + Directory.CreateDirectory(manifestDir); + + var manifestPath = Path.Combine(manifestDir, "WorkloadManifest.json"); + if (!File.Exists(manifestPath)) + { + // Write a minimal manifest file + string manifestContents = $$""" +{ + "version": "{{manifestUpdate.NewVersion}}", + "workloads": {}, + "packs": {} +} +"""; + File.WriteAllText(manifestPath, manifestContents); + } + } } public IEnumerable GetDownloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, bool includeInstalledItems) diff --git a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs index 4dc46351eae2..6d6d89fb7149 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs @@ -1,17 +1,18 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#nullable disable - using System.CommandLine; using System.Text.Json; using ManifestReaderTests; using Microsoft.DotNet.Cli.Commands; +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.Commands.Workload.Install; using Microsoft.DotNet.Cli.Commands.Workload.Repair; using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Workload.Install.Tests; using Microsoft.NET.Sdk.WorkloadManifestReader; +using static Microsoft.NET.Sdk.WorkloadManifestReader.IWorkloadManifestProvider; namespace Microsoft.DotNet.Cli.Workload.Repair.Tests { @@ -85,7 +86,7 @@ public void GivenExtraPacksInstalledRepairGarbageCollects(bool userLocal) // Add extra pack dirs and records var extraPackRecordPath = Path.Combine(installRoot, "metadata", "workloads", "InstalledPacks", "v1", "Test.Pack.A", "1.0.0", sdkFeatureVersion); - Directory.CreateDirectory(Path.GetDirectoryName(extraPackRecordPath)); + Directory.CreateDirectory(Path.GetDirectoryName(extraPackRecordPath)!); var extraPackPath = Path.Combine(installRoot, "packs", "Test.Pack.A", "1.0.0"); Directory.CreateDirectory(extraPackPath); var packRecordContents = JsonSerializer.Serialize(new(new WorkloadPackId("Test.Pack.A"), "1.0.0", WorkloadPackKind.Sdk, extraPackPath, "Test.Pack.A")); @@ -151,5 +152,43 @@ public void GivenMissingPacksRepairFixesInstall(bool userLocal) Directory.GetDirectories(Path.Combine(installRoot, "packs")).Length.Should().Be(7); Directory.GetDirectories(Path.Combine(installRoot, "metadata", "workloads", "InstalledPacks", "v1")).Length.Should().Be(8); } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public void GivenMissingManifestsInWorkloadSetModeRepairReinstallsManifests(bool userLocal) + { + var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + + mockInstaller.InstalledManifests.Should().HaveCount(0); + + var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, sdkFeatureVersion, workloadResolver, userProfileDir); + + // Attach the corruption repairer to the manifest provider + var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot, manifestDownload: true); + var corruptionRepairer = new WorkloadManifestCorruptionRepairer( + _reporter, + mockInstaller, + workloadResolver, + new SdkFeatureBand(sdkFeatureVersion), + dotnetRoot, + userProfileDir, + nugetDownloader, + packageSourceLocation: null, + VerbosityOptions.detailed); + manifestProvider.CorruptionRepairer = corruptionRepairer; + + // Directly trigger the manifest health check and repair + corruptionRepairer.EnsureManifestsHealthy(ManifestCorruptionFailureMode.Repair); + + // Verify that manifests were installed by the corruption repairer + mockInstaller.InstalledManifests.Should().HaveCount(2, "Manifests should be installed after EnsureManifestsHealthy call"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-android-build"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-ios-sdk"); + + // Verify the repair process was triggered (the corruption repairer shows this message) + _reporter.Lines.Should().Contain(line => line.Contains("Repairing workload set")); + } } } diff --git a/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs b/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs index 301293b0141f..76b0c8453e00 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs @@ -15,7 +15,7 @@ public GivenDotnetWorkloadRestore(ITestOutputHelper log) : base(log) [Fact] public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() { - if(IsRunningInContainer()) + if (IsRunningInContainer()) { // Skipping test in a Helix container environment due to read-only DOTNET_ROOT, which causes workload restore to fail when writing workload metadata. return; @@ -38,7 +38,7 @@ public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() [Fact] public void ProjectsThatDoNotSupportWorkloadsAndAreTransitivelyReferencedDoNotBreakTheBuild() { - if(IsRunningInContainer()) + if (IsRunningInContainer()) { // Skipping test in a Helix container environment due to read-only DOTNET_ROOT, which causes workload restore to fail when writing workload metadata. return; diff --git a/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs b/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs index ca5c48b55f71..52f0dc4f56cd 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs @@ -3,6 +3,7 @@ #nullable disable +using System.Reflection.Metadata.Ecma335; using Microsoft.NET.Sdk.WorkloadManifestReader; namespace Microsoft.DotNet.Cli.Workload.Search.Tests @@ -14,19 +15,22 @@ public class MockWorkloadResolver : IWorkloadResolver private readonly Func> _getPacksInWorkload; private readonly Func _getPackInfo; private readonly Func _getManifest; + private readonly IWorkloadManifestProvider _manifestProvider; public MockWorkloadResolver( IEnumerable availableWorkloads, IEnumerable installedManifests = null, Func> getPacks = null, Func getPackInfo = null, - Func getManifest = null) + Func getManifest = null, + IWorkloadManifestProvider manifestProvider = null) { _availableWorkloads = availableWorkloads; _installedManifests = installedManifests; _getPacksInWorkload = getPacks; _getPackInfo = getPackInfo; _getManifest = getManifest; + _manifestProvider = manifestProvider; } public IEnumerable GetAvailableWorkloads() => _availableWorkloads; @@ -48,6 +52,6 @@ public void RefreshWorkloadManifests() { /* noop */ } public IEnumerable GetUpdatedWorkloads(WorkloadResolver advertisingManifestResolver, IEnumerable installedWorkloads) => throw new NotImplementedException(); WorkloadResolver IWorkloadResolver.CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException(); WorkloadManifest IWorkloadResolver.GetManifestFromWorkload(WorkloadId workloadId) => _getManifest?.Invoke(workloadId) ?? throw new NotImplementedException(); - public IWorkloadManifestProvider GetWorkloadManifestProvider() => throw new NotImplementedException(); + public IWorkloadManifestProvider GetWorkloadManifestProvider() => _manifestProvider ?? throw new NotImplementedException(); } } diff --git a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs index 3f0a820e801d..ad9d1f77b290 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs @@ -67,13 +67,15 @@ public void GivenWorkloadUpdateFromHistory() IEnumerable installedManifests = new List() { new WorkloadManifestInfo("microsoft.net.sdk.android", "34.0.0-rc.1", "androidDirectory", "8.0.100-rc.1"), new WorkloadManifestInfo("microsoft.net.sdk.ios", "16.4.8825", "iosDirectory", "8.0.100-rc.1") }; + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand("8.0.100-rc.1") }; var workloadResolver = new MockWorkloadResolver( new string[] { "maui-android", "maui-ios" }.Select(s => new WorkloadInfo(new WorkloadId(s), null)), installedManifests, id => new List() { new WorkloadPackId(id.ToString() + "-pack") }, id => id.ToString().Contains("android") ? mauiAndroidPack : - id.ToString().Contains("ios") ? mauiIosPack : null); + id.ToString().Contains("ios") ? mauiIosPack : null, + manifestProvider: manifestProvider); IWorkloadResolverFactory mockResolverFactory = new MockWorkloadResolverFactory( Path.Combine(Path.GetTempPath(), "dotnetTestPath"), @@ -304,7 +306,8 @@ public void UpdateViaWorkloadSet(bool upgrade, bool? installStateUseWorkloadSet, } "; var nugetPackageDownloader = new MockNuGetPackageDownloader(); - var workloadResolver = new MockWorkloadResolver([new WorkloadInfo(new WorkloadId("android"), string.Empty)], getPacks: id => [], installedManifests: []); + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand(sdkVersion) }; + var workloadResolver = new MockWorkloadResolver([new WorkloadInfo(new WorkloadId("android"), string.Empty)], getPacks: id => [], installedManifests: [], manifestProvider: manifestProvider); var workloadInstaller = new MockPackWorkloadInstaller( dotnetDir, installedWorkloads: [new WorkloadId("android")], @@ -375,13 +378,16 @@ public void GivenWorkloadUpdateItFindsGreatestWorkloadSetWithSpecifiedComponents WorkloadManifest iosManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.iOS"); WorkloadManifest macosManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.macOS"); WorkloadManifest mauiManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.Maui"); + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand("9.0.100") }; + MockWorkloadResolver resolver = new([new WorkloadInfo(new WorkloadId("ios"), ""), new WorkloadInfo(new WorkloadId("macos"), ""), new WorkloadInfo(new WorkloadId("maui"), "")], installedManifests: [ new WorkloadManifestInfo("Microsoft.NET.Sdk.iOS", "17.4.3", Path.Combine(testDirectory, "iosManifest"), "9.0.100"), new WorkloadManifestInfo("Microsoft.NET.Sdk.macOS", "14.4.3", Path.Combine(testDirectory, "macosManifest"), "9.0.100"), new WorkloadManifestInfo("Microsoft.NET.Sdk.Maui", "14.4.3", Path.Combine(testDirectory, "mauiManifest"), "9.0.100") ], - getManifest: id => id.ToString().Equals("ios") ? iosManifest : id.ToString().Equals("macos") ? macosManifest : mauiManifest); + getManifest: id => id.ToString().Equals("ios") ? iosManifest : id.ToString().Equals("macos") ? macosManifest : mauiManifest, + manifestProvider: manifestProvider); MockNuGetPackageDownloader nugetPackageDownloader = new(packageVersions: [new NuGetVersion("9.103.0"), new NuGetVersion("9.102.0"), new NuGetVersion("9.101.0"), new NuGetVersion("9.100.0")]); WorkloadUpdateCommand command = new( parseResult, @@ -654,5 +660,55 @@ public void GivenInvalidVersionInRollbackFileItErrors() return (dotnetRoot, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader, workloadResolverFactory); } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public void GivenMissingManifestsInWorkloadSetModeUpdateReinstallsManifests(bool userLocal) + { + var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + + mockInstaller.InstalledManifests.Should().HaveCount(0); + + var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, sdkFeatureVersion, workloadResolver, userProfileDir); + + // Attach the corruption repairer to the manifest provider + var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot, manifestDownload: true); + manifestProvider.CorruptionRepairer = new WorkloadManifestCorruptionRepairer( + _reporter, + mockInstaller, + workloadResolver, + new SdkFeatureBand(sdkFeatureVersion), + dotnetRoot, + userProfileDir, + nugetDownloader, + packageSourceLocation: null, + VerbosityOptions.detailed); + + // Advertise a NEWER workload set version than what's currently installed (6.0.100) + // so that the update command proceeds with manifest installation + var workloadManifestUpdater = new MockWorkloadManifestUpdater( + manifestUpdates: [ + new ManifestUpdateWithWorkloads(new ManifestVersionUpdate(new ManifestId("xamarin-android-build"), new ManifestVersion("8.4.8"), "6.0.100"), Enumerable.Empty>().ToDictionary()), + new ManifestUpdateWithWorkloads(new ManifestVersionUpdate(new ManifestId("xamarin-ios-sdk"), new ManifestVersion("10.0.2"), "6.0.100"), Enumerable.Empty>().ToDictionary()) + ], + fromWorkloadSet: true, workloadSetVersion: "6.0.101"); + + var parseResult = Parser.Parse(new string[] { "dotnet", "workload", "update" }); + + // Run update command + var updateCommand = new WorkloadUpdateCommand(parseResult, reporter: _reporter, workloadResolverFactory, + workloadInstaller: mockInstaller, workloadManifestUpdater: workloadManifestUpdater); + updateCommand.Execute(); + + // Verify that manifests were reinstalled + mockInstaller.InstalledManifests.Should().HaveCount(2); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-android-build"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-ios-sdk"); + + // Verify command succeeded + _reporter.Lines.Should().NotContain(line => line.Contains("failed", StringComparison.OrdinalIgnoreCase)); + } } } From 0ce4bc8790c65d93a2762837850b9a6f35935fa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 00:35:01 +0000 Subject: [PATCH 09/11] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7ab59db215a..cc20a9a3c554 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fb5a4dc8b4b1..ac849c3fa358 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.0-preview.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.0-preview.26077.113 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26077-101 - 7.0.2-rc.7801 + 18.0.11-servicing-26077-113 + 7.0.2-rc.7813 10.0.104 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 10.0.0-preview.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 2.0.0-preview.1.26077.101 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 10.0.0-preview.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 2.0.0-preview.1.26077.113 2.2.4 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26077.101 + 14.0.104-servicing.26077.113 10.0.4 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 10.0.4-servicing.26077.101 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.101 - 10.0.4-servicing.26077.101 - 18.0.1-release-26077-101 + 10.0.0-preview.26077.113 + 10.0.4-servicing.26077.113 + 18.0.1-release-26077-113 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26077.101 + 10.0.104-servicing.26077.113 10.0.104 - 10.0.104-servicing.26077.101 + 10.0.104-servicing.26077.113 10.0.104 10.0.104 - 10.0.104-servicing.26077.101 - 18.0.1-release-26077-101 - 18.0.1-release-26077-101 + 10.0.104-servicing.26077.113 + 18.0.1-release-26077-113 + 18.0.1-release-26077-113 3.2.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99effa0a3a8a..02c43a3ebdf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 diff --git a/global.json b/global.json index aebbf7f47142..b3a77f359c1d 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 61d729a1933212c1ce05b50d8211445823bf822a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 05:41:49 +0000 Subject: [PATCH 10/11] [release/10.0.1xx] ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdentifier is null. (#52485) Co-authored-by: Tom Deseyn Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Co-authored-by: DonnaChen888 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marc Paine --- .../ProcessFrameworkReferencesTests.cs | 72 +++++++++++++++++++ .../ProcessFrameworkReferences.cs | 8 ++- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index 50b1b9c8df00..e4f298db6844 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -76,6 +76,30 @@ public class ProcessFrameworkReferencesTests } """; + private const string NonPortableRid = "fedora.42-x64"; + + private static readonly string NonPortableRuntimeGraph = $$""" + { + "runtimes": { + "base": { + "#import": [] + }, + "any": { + "#import": ["base"] + }, + "linux": { + "#import": ["any"] + }, + "linux-x64": { + "#import": ["linux"] + }, + "{{NonPortableRid}}": { + "#import": ["linux-x64"] + } + } + } + """; + // Shared known framework references private readonly MockTaskItem _validWindowsSDKKnownFrameworkReference = CreateKnownFrameworkReference( "Microsoft.Windows.SDK.NET.Ref", "net5.0-windows10.0.18362", "10.0.18362.1-preview", @@ -491,6 +515,7 @@ public void It_handles_real_world_ridless_scenario_with_aot_and_trimming() ["TargetFramework"] = "net10.0", ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", ["ILCompilerPackVersion"] = "10.0.0-rc.2.25457.102", + ["ILCompilerPortableRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64", ["ILCompilerRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64" }); @@ -766,5 +791,52 @@ public void It_handles_complex_cross_compilation_RuntimeIdentifiers() $"Should include runtime pack for supported RID: {rid}"); } } + + [Theory] + [InlineData(null, "linux-x64")] + [InlineData("linux-x64", "linux-x64")] + [InlineData(NonPortableRid, NonPortableRid)] + public void It_selects_correct_ILCompiler_based_on_RuntimeIdentifier(string? runtimeIdentifier, string expectedILCompilerRid) + { + var netCoreAppRef = CreateKnownFrameworkReference("Microsoft.NETCore.App", "net10.0", "10.0.1", + "Microsoft.NETCore.App.Runtime.**RID**", + "linux-x64;" + NonPortableRid); + + var ilCompilerPack = new MockTaskItem("Microsoft.DotNet.ILCompiler", new Dictionary + { + ["TargetFramework"] = "net10.0", + ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", + ["ILCompilerPackVersion"] = "10.0.1", + ["ILCompilerPortableRuntimeIdentifiers"] = "linux-x64", + ["ILCompilerRuntimeIdentifiers"] = "linux-x64;" + NonPortableRid + }); + + var config = new TaskConfiguration + { + TargetFrameworkVersion = "10.0", + EnableRuntimePackDownload = true, + PublishAot = true, + NETCoreSdkRuntimeIdentifier = NonPortableRid, + NETCoreSdkPortableRuntimeIdentifier = "linux-x64", + RuntimeIdentifier = runtimeIdentifier, + RuntimeGraphPath = CreateRuntimeGraphFile(NonPortableRuntimeGraph), + FrameworkReferences = new[] { new MockTaskItem("Microsoft.NETCore.App", new Dictionary()) }, + KnownFrameworkReferences = new[] { netCoreAppRef }, + KnownILCompilerPacks = new[] { ilCompilerPack } + }; + + var task = CreateTask(config); + task.Execute().Should().BeTrue("Task should succeed"); + + // Validate that the expected ILCompiler pack is used + task.PackagesToDownload.Should().NotBeNull(); + task.PackagesToDownload.Should().Contain(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler"), + "Should include ILCompiler pack when PublishAot is true"); + + var ilCompilerPackage = task.PackagesToDownload.FirstOrDefault(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler")); + ilCompilerPackage.Should().NotBeNull(); + ilCompilerPackage!.ItemSpec.Should().Contain(expectedILCompilerRid, + $"Should use {expectedILCompilerRid} ILCompiler pack"); + } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs index 7b5b7bc0da15..fcc306fd454c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs @@ -816,8 +816,10 @@ private ToolPackSupport AddToolPack( if (toolPackType is ToolPackType.Crossgen2 or ToolPackType.ILCompiler) { var packNamePattern = knownPack.GetMetadata(packName + "PackNamePattern"); - var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(';'); - var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(';'); + var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + // Use the non-portable RIDs if there are no portable RIDs defined. + packSupportedPortableRuntimeIdentifiers = packSupportedPortableRuntimeIdentifiers.Length > 0 ? packSupportedPortableRuntimeIdentifiers : packSupportedRuntimeIdentifiers; // When publishing for a non-portable RID, prefer NETCoreSdkRuntimeIdentifier for the host. // Otherwise prefer the NETCoreSdkPortableRuntimeIdentifier. @@ -835,11 +837,11 @@ private ToolPackSupport AddToolPack( string? supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _); bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) - && supportedTargetRid is not null && supportedPortableTargetRid is not null && supportedTargetRid == supportedPortableTargetRid; // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture Log.LogMessage(MessageImportance.Low, $"Determining best RID for '{knownPack.ItemSpec}@{packVersion}' from among '{knownPack.GetMetadata(packName + "RuntimeIdentifiers")}'"); + string? hostRuntimeIdentifier = usePortable ? NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkPortableRuntimeIdentifier!, packSupportedPortableRuntimeIdentifiers, out _) : NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkRuntimeIdentifier!, packSupportedRuntimeIdentifiers, out _); From 0f87898a33e582e73946cc3faa6b01087f107534 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:35:53 +0000 Subject: [PATCH 11/11] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 368 +++++----- eng/Version.Details.xml | 677 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 6 +- 9 files changed, 539 insertions(+), 538 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc20a9a3c554..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ac849c3fa358..152bf4a7708c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-preview.26077.113 - 10.0.4 - 10.0.4 - 18.0.11 - 18.0.11-servicing-26077-113 - 7.0.2-rc.7813 - 10.0.104 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.0-preview.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 2.0.0-preview.1.26077.113 - 2.2.4 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 14.0.104-servicing.26077.113 - 10.0.4 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 10.0.200-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 15.2.100-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.113 - 10.0.4-servicing.26077.113 - 18.0.1-release-26077-113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 18.0.1-release-26077-113 - 18.0.1-release-26077-113 - 3.2.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 10.0.4 - 2.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + + 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 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 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 + 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 @@ -148,31 +150,7 @@ This file should be imported by eng/Versions.props - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02c43a3ebdf6..86e972a9b013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -569,9 +572,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad03..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index b3a77f359c1d..79e3450feaac 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.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"