From 523fd953a3cb8b1a7d6658b31fb21c7711820098 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 19 May 2022 14:28:32 +0000 Subject: [PATCH] Merged PR 23035: [internal/release/6.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 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22267.4 to 6.0.106-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220518.20 - **Date Produced**: May 18, 2022 10:38:32 PM UTC - **Commit**: 5080045df61ed4394fb46368acaa7ba7c7d2f664 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.106-se... --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7132d739a..7e3e7efe1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7b90e356..8c2d0d531 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9d7c7030992e13a9b810b19e79de56759a78d6bc + 7d10adc397690db6f5c73da866aa443232ff1c88 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b90b48141f0ae7aeb382ff740ff3820ff19e7e29 + 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 26322bd46d41c0307d94d6555fdf10f88fa7b449 + 11bc94b8ceb7d753d43b8ed6732d1a5eb91081f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e63285207de6e585dc4be11472a284ed57fa2e35 + 5080045df61ed4394fb46368acaa7ba7c7d2f664 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e63285207de6e585dc4be11472a284ed57fa2e35 + 5080045df61ed4394fb46368acaa7ba7c7d2f664 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e36f1456f1c6aff57150a30ac06f3cceaf2b2785 + dabcf2041548f7594b21e9bf865463abdfd14307 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e28eda2d7..0ea02773f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.2 + 6.0.6-servicing.22268.4 @@ -46,18 +46,18 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 - 6.0.6-servicing.22267.6 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 + 6.0.6-servicing.22268.5 0.2.0 - 6.0.106-servicing.22268.6 - 6.0.106-servicing.22268.6 + 6.0.106-servicing.22268.20 + 6.0.106-servicing.22268.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.6-servicing.22267.5 - 6.0.6-servicing.22267.5 + 6.0.6-servicing.22268.6 + 6.0.6-servicing.22268.6 6.0.6 6.0.6