From 10d0c0421eb6dbaed2f874003c88a34d96b4035e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Nov 2023 13:45:41 +0000 Subject: [PATCH 1/2] Merged PR 35312: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.0 to 8.0.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20231120.18 - **Date Produced**: November 21, 2023 6:33:14 AM UTC - **Commit**: f83afe4ed0000ee202b2528bc5803a94130a0f4c - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.0-rtm.23531.3 to 8.0.1-servicing.23570.18][5] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.0 to 8.0.1][5] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.0 to 8.0.1][5] - **Microsoft.NETCore.App.Ref**: [from 8.0.0 to 8.0.1][5] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.1][5] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.0 to 8.0.1][5] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23531.3 to 8.0.1-servicing.23570.18][5] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.0-rtm.23531.3 to 8.0.1-servicing.23570.18][5] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.0 to 8.0.1][6] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5535e31a71&targetVersion=GCf83afe4ed0&_a=files [6]: https://github.com/dotnet/emsdk/compare/2406616d0e...d75f77cb8e [DependencyUpdate]: <> (End) [marker]: <> (End:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) --- Directory.Packages.props | 32 ++++++------- NuGet.config | 3 ++ eng/Version.Details.xml | 100 ++++++++++++++++++++++++++++++++------- eng/Versions.props | 35 +++++++++----- 4 files changed, 125 insertions(+), 45 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 49e2459b9fb4..5d37eb795d6b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -32,12 +32,12 @@ - + - + @@ -55,8 +55,8 @@ - + @@ -82,27 +82,27 @@ - - - - - - - + + + + + + + - + - - + + - - + + diff --git a/NuGet.config b/NuGet.config index e9f9f4343c64..1240422c1b95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -18,6 +19,7 @@ + @@ -53,6 +55,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8b655b96fe7..1bbfb3739b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 563930b1d9ad60c8d7dbd1975390f5870601defa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + d75f77cb8eb87322453288a22ce9b2d880bd1cb1 https://github.com/dotnet/msbuild @@ -192,9 +192,9 @@ https://github.com/microsoft/vstest 053d7114a72aac12d1382ecc2a23b2dfdd5b084b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -409,6 +409,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e4ede9b8979b9d2b1b1d4383f30a791414f0625b + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + diff --git a/eng/Versions.props b/eng/Versions.props index 85c65427d517..c19597daf6ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,6 @@ 1.0.0-20230414.1 - 2.1.0-preview2-26306-03 2.21.0 2.0.1-servicing-26011-01 13.0.3 @@ -40,7 +39,6 @@ 4.3.0 4.3.0 4.0.5 - 7.0.3 8.0.0 4.6.0 2.0.0-beta4.23307.1 @@ -50,20 +48,36 @@ - 8.0.0 - 8.0.0-rtm.23531.3 - 8.0.0 + 8.0.1 + 8.0.1-servicing.23570.18 + 8.0.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.3 + 8.0.1 + 8.0.1-servicing.23570.18 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) + 8.0.0 8.0.0 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 8.0.0 + 8.0.0 + 8.0.0 @@ -210,8 +224,7 @@ - 8.0.0 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 4297b828999a60c3f1f3ac1ffcd2671d4fc0dfa1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 18 Jan 2024 13:41:04 -0800 Subject: [PATCH 2/2] Update to the shipped 8.0.1 builds --- NuGet.config | 3 - eng/Version.Details.xml | 136 ++++++++++++++++++++-------------------- eng/Versions.props | 26 ++++---- 3 files changed, 81 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1240422c1b95..e9f9f4343c64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,7 +18,6 @@ - @@ -55,7 +53,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bbfb3739b9d..e70c69e24a3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,32 +12,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -45,11 +45,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://github.com/dotnet/emsdk - d75f77cb8eb87322453288a22ce9b2d880bd1cb1 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://github.com/dotnet/msbuild @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 4fc721bbc2c0eac5931f588e1d14ab2a1f936646 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c https://github.com/nuget/nuget.client @@ -194,7 +194,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -212,70 +212,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + 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-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + 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-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://github.com/dotnet/razor @@ -290,21 +290,21 @@ https://github.com/dotnet/razor df383360c34ada8889fdf18dc36d245f2938db66 - + 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://github.com/dotnet/xdt @@ -333,9 +333,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - - https://github.com/dotnet/source-build-externals - 83274d94c7e2ff21081b0d75ecbec2da2241f831 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e @@ -409,9 +409,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -421,9 +421,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 8e941eb42f819adb116b881195158b3887a70a1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -453,9 +453,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c19597daf6ae..0f329a276dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ 8.0.1 - 8.0.1-servicing.23570.18 + 8.0.1-servicing.23580.1 8.0.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.0 8.0.1 - 8.0.1-servicing.23570.18 + 8.0.1-servicing.23580.1 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 @@ -63,7 +63,7 @@ 8.0.1 8.0.0 8.0.0 - 8.0.0 + 8.0.1 8.0.0 8.0.0 8.0.0 @@ -71,12 +71,12 @@ 8.0.0 8.0.0 8.0.0 - 8.0.0 + 8.0.1 8.0.0 8.0.0 8.0.0 8.0.0 - 8.0.0 + 8.0.1 8.0.0 @@ -164,13 +164,13 @@ - 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.0 + 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 + 8.0.1 @@ -180,7 +180,7 @@ - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23580.5