From b314d7c39b74aafc6d963b6367d801d4f9e8e025 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:57:23 -0800 Subject: [PATCH] Merging internal commits for release/8.0.4xx (#20234) Co-authored-by: Mirroring Co-authored-by: DotNet-Bot Co-authored-by: maestro-prod-Primary Co-authored-by: Marc Paine --- NuGet.config | 16 +++--- eng/Version.Details.xml | 122 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++-------- 3 files changed, 95 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ff66bacff31..e91fe256ff02 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,13 @@ + - - - - - - - + + @@ -25,8 +21,10 @@ + + @@ -45,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8046ee70196e..001c265d8e49 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 - f655eecd22b6810f2989d8ec783f5798a709ab06 + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + 5dd80ae4b107027f86bda68ce91542cad72b2868 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4efded416f8216935683d9a12e2eb45df78a728 + 3069afa2664d12f5290b7002c5a9eb110e4ea844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e84ed744bb7989299c544f715056d05e220c7e00 + 42a83a56d421ac71312453e53dbacc3d2ae6d432 - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 @@ -146,13 +146,13 @@ 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - b4e5d1dde7212b8c1636632220682ca40bed90b7 + + https://github.com/dotnet/roslyn + cfe3bd0a653ebd218fec07ff4cce9a994715a473 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e diff --git a/eng/Versions.props b/eng/Versions.props index 4670e73d1a8f..68df5798ebe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.10-servicing.24468.3 + 8.0.11-servicing.24521.3 - 8.0.10-servicing.24468.10 + 8.0.11-servicing.24521.7 @@ -64,52 +64,52 @@ - 8.0.10 - 8.0.10 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 + 8.0.11 + 8.0.11 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 0.2.0 - 8.0.403 - 8.0.403-servicing.24469.19 - 8.0.403-servicing.24469.19 + 8.0.404 + 8.0.404-servicing.24521.39 + 8.0.404-servicing.24521.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24468.6 + 4.11.0-3.24510.3 - 8.0.10-servicing.24466.10 + 8.0.11-servicing.24517.7 - 8.0.10-servicing.24466.10 - 8.0.10-servicing.24466.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24517.7 + 8.0.11-servicing.24517.7 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 2.1.0 8.0.1 6.0.1 - 8.0.10-servicing.24468.5 - 8.0.10-servicing.24468.5 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24521.5 + 8.0.11-servicing.24521.5 + 8.0.11 + 8.0.11 @@ -182,7 +182,7 @@ 14.0.8478 17.0.8478 - 8.0.10 + 8.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))