From 5dbe778528a3149d10e7b9e192eb8931a348682c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 20:35:23 +0000 Subject: [PATCH] Merged PR 36623: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## 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.WindowsDesktop.App.Ref**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.2-servicing.24060.10 to 8.0.2-servicing.24060.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - ... --- NuGet.config | 29 ++++-------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 42 ++++++++--------- 3 files changed, 81 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2dccf8439..6c3231a2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ - - - - + - - - + - - - + - + - + @@ -50,19 +43,15 @@ - - - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9295fac..e27dd2082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + 35307d0f7a7381a850bde13723241862ba824b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0ede9037ff59dc76c37ec87659a641cfbccd6e30 + 4c5c25180f2937b7c0691483dc892169fc13ddb3 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d diff --git a/eng/Versions.props b/eng/Versions.props index d21121587..9acc7c575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24060.4 - 8.0.2-servicing.24060.10 + 8.0.2-servicing.24060.15 @@ -72,13 +72,13 @@ - 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 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24061.11 - 8.0.102-servicing.24061.11 + 8.0.102-servicing.24068.26 + 8.0.102-servicing.24068.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,22 +98,22 @@ - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.2-servicing.24060.14 - 8.0.2-servicing.24060.14 + 8.0.2-servicing.24061.2 + 8.0.2-servicing.24061.2 8.0.2 8.0.2 @@ -258,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))