diff --git a/NuGet.config b/NuGet.config index 02e6768deb66..4073268e17b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -38,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72a3effd5592..52755c068f65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74e82c7a451f7350b264b64f8ea43fde017ec0af + 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6254f5ca64f85b90327592dff67ea6b2ec0262c6 + ee417479933278bb5aadc5944706a96b5ef74a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b05b06bb8ee2d31ffd53e0c923abbd42a8356263 + 2fa9beee6233beabbd7d2b212fc8f850c96a5629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b05b06bb8ee2d31ffd53e0c923abbd42a8356263 + 2fa9beee6233beabbd7d2b212fc8f850c96a5629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b05b06bb8ee2d31ffd53e0c923abbd42a8356263 + 2fa9beee6233beabbd7d2b212fc8f850c96a5629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b05b06bb8ee2d31ffd53e0c923abbd42a8356263 + 2fa9beee6233beabbd7d2b212fc8f850c96a5629 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5f22caf2baf9cfbdf67939e7f9205bd47a41dbed + db3d9d83e350dbba9a38c15542fca2dbb297904a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3ff72f664fd6e585b4b61fe5d79f33255aca5d6c + 925e025a1ad14f0b6f094e5b2d5cc9f62ada294c https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + a2266c728f63a494ccb6786d794da2df135030be https://github.com/dotnet/roslyn @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 + 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 + 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 diff --git a/eng/Versions.props b/eng/Versions.props index 7298b568405c..f7d486701a56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.21-servicing.25475.3 + 8.0.22-servicing.25528.2 - 8.0.21-servicing.25475.4 + 8.0.22-servicing.25528.2 @@ -64,22 +64,22 @@ - 8.0.21 - 8.0.21 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 - 8.0.21-servicing.25475.15 + 8.0.22 + 8.0.22 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 + 8.0.22-servicing.25528.8 0.2.0 - 8.0.121 - 8.0.121-servicing.25475.16 - 8.0.121-servicing.25475.16 + 8.0.122 + 8.0.122-servicing.25528.8 + 8.0.122-servicing.25528.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,16 +90,16 @@ - 8.0.21-servicing.25475.13 + 8.0.22-servicing.25527.7 - 8.0.21-servicing.25475.13 - 8.0.21-servicing.25475.13 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 + 8.0.22-servicing.25527.7 + 8.0.22-servicing.25527.7 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 2.1.0 8.0.1 6.0.1 @@ -107,10 +107,10 @@ - 8.0.21-servicing.25475.7 - 8.0.21-servicing.25475.7 - 8.0.21 - 8.0.21 + 8.0.22-servicing.25528.1 + 8.0.22-servicing.25528.1 + 8.0.22 + 8.0.22 @@ -183,7 +183,7 @@ 14.0.8478 17.0.8478 - 8.0.21 + 8.0.22 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch b/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch index 9054ce55bb18..f9b497c2dc5c 100644 --- a/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch +++ b/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic -Date: Fri, 18 Apr 2025 18:30:01 +0000 +Date: Tue, 28 Oct 2025 11:06:17 -0700 Subject: [PATCH] Update MSBuild dependencies Backport: https://github.com/dotnet/runtime/issues/101395 @@ -10,7 +10,7 @@ Backport: https://github.com/dotnet/runtime/issues/101395 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index c0d77ea95ce..f4353aa9cab 100644 +index ae64afc8979..27d773bb036 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,6 +414,18 @@ @@ -33,7 +33,7 @@ index c0d77ea95ce..f4353aa9cab 100644 https://github.com/dotnet/msbuild 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 diff --git a/eng/Versions.props b/eng/Versions.props -index 08c67394ba7..e125a1882cc 100644 +index 890522fc1a2..4978285b0ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -183,9 +183,9 @@