From 6f22dc86d812dd33b093aeca629626587d1d6a1f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:18:47 -0800 Subject: [PATCH] Merging internal commits for release/8.0.1xx (#18164) --- NuGet.config | 10 ++ eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 61 +++++---- .../repo-projects/Directory.Build.props | 3 + 4 files changed, 112 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31081bc89..e03fc8203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc4f89993..4f21ade59 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 - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 https://github.com/dotnet/test-templates @@ -124,35 +124,35 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - f43cd10b737b6343956dee421cff8c50b602c788 + 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b diff --git a/eng/Versions.props b/eng/Versions.props index 483cf5b57..77453e103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23580.6 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23580.5 @@ -72,50 +72,50 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 - 8.0.100 - 8.0.100-rtm.23551.6 - 8.0.100-rtm.23551.6 + 8.0.101 + 8.0.101-servicing.23580.21 + 8.0.101-servicing.23580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.11 + 4.8.0-7.23572.1 - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23580.1 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 @@ -234,11 +234,20 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 + 8.0.100 + 8.0.0-preview.1.23551.7 + 8.0.100-rc.2 + 8.0.0-rc.2.9373 + 34.0.0-rc.2.468 + 16.4.8968-net8-rc2 + 16.4.8968-net8-rc2 + 13.3.8968-net8-rc2 + 16.4.8968-net8-rc2 8.0.100 8.0.0-preview.1.23557.2 8.0.100 @@ -249,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 4b2215bd4..29747eaa0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,6 +110,9 @@ + + +