diff --git a/NuGet.config b/NuGet.config index 6c79f8a6e6aa..f475ee113e49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,35 +7,24 @@ - - - - + - - - - + - - + - - - - - - - - + + + + @@ -56,27 +45,19 @@ - - - - + - - + - - - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e03c3569f85b..8525a2b6e412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 954f381d16c2d44b573890786ca2d071c217a433 + 1d205826ddc14c8f868eb6373e7a6bafcb9fe5be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 954f381d16c2d44b573890786ca2d071c217a433 + 1d205826ddc14c8f868eb6373e7a6bafcb9fe5be - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9b5f402943986a66dfca2b6f4312cfca19d75c17 + e0de28a9ae13d9444c39fbad560ebec71854e11e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c9e44425226553e639116ff82698cfd2808f7769 + a7dff252f2a6b0ff48ffe946a20584f61282aa13 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - c68eace1f3c11ab25cdf30a425ab3792773bb2cc + d440134ad1037c7a3c91c78fff964078f240e08c https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index e6354b90bd32..03f0859ab977 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.35-servicing.24462.9 + 6.0.36-servicing.24515.13 - 6.0.35-servicing.24462.14 + 6.0.36-servicing.24516.3 @@ -43,20 +43,20 @@ - 6.0.35 - 6.0.35 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 + 6.0.36 + 6.0.36 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 0.2.0 - 6.0.135-servicing.24466.24 - 6.0.135-servicing.24466.24 + 6.0.136-servicing.24517.39 + 6.0.136-servicing.24517.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.35-servicing.24459.18 - 6.0.35-servicing.24459.18 - 6.0.35 - 6.0.35 - 6.0.35 - 6.0.35 + 6.0.36-servicing.24514.21 + 6.0.36-servicing.24514.21 + 6.0.36 + 6.0.36 + 6.0.36 + 6.0.36 2.1.0 - 6.0.35-servicing.24463.5 - 6.0.35-servicing.24463.5 - 6.0.35 - 6.0.35 + 6.0.36-servicing.24517.2 + 6.0.36-servicing.24517.2 + 6.0.36 + 6.0.36 @@ -155,7 +155,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.35 + 6.0.36 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Use-PVP-for-dependency-failures.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Use-PVP-for-dependency-failures.patch new file mode 100644 index 000000000000..b079cdc81d85 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0005-Use-PVP-for-dependency-failures.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ella Hathaway +Date: Mon, 21 Oct 2024 15:32:21 +0000 +Subject: [PATCH] Use PVP for dependency failures + +Background Issue: https://github.com/dotnet/source-build/issues/4681 +--- + eng/Packages.props | 4 ++-- + eng/Version.Details.xml | 8 ++++++++ + eng/Versions.props | 2 ++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/eng/Packages.props b/eng/Packages.props +index 9ce0d2ebae..13082006de 100644 +--- a/eng/Packages.props ++++ b/eng/Packages.props +@@ -31,8 +31,8 @@ + + + +- +- ++ ++ + + + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 494f66c624..df4293c5b1 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -22,5 +22,13 @@ + https://github.com/dotnet/arcade + e438144bbffb29ed5d7c113dc4947b51650344dc + ++ ++ https://github.com/dotnet/runtime ++ e37fab9fc9f7bce120a7165491ed392a73f8ab51 ++ ++ ++ https://github.com/dotnet/runtime ++ 55fb7ef977e7d120dc12f0960edcff0739d7ee0e ++ + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 7a9903f7de..709e8894d6 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -26,6 +26,8 @@ + + + 4.6.0 ++ 6.0.4 ++ 6.0.1 + + +