From 9dbd715de3b00bbf659eeb96681cfd173d09e2a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:19:00 +0000 Subject: [PATCH] Merged PR 32043: [internal/release/6.0.4xx] 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.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230619.18 - **Date Produced**: June 19, 2023 4:52:53 PM UTC - **Commit**: 06aa117f6fde6b16a29b2808caddffd01279c574 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.411-servicing.23316.46 to 6.0.411-servicing.23319.18][1] - **Microsoft.NET.Sdk**: [from 6.0.411-servicing.23316.46 to 6.0.411-servicing.23319.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85cbee834..1830d5f48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad7b66fe2..803276a6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da62ce98a3ee40bd5a5f68e089a7d7fe11c8ba51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 256cc027914283de5cb622ce409326aa0aa2e4ff + a515e11d5b5b327a857a7500dee968887c619e4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 256cc027914283de5cb622ce409326aa0aa2e4ff + a515e11d5b5b327a857a7500dee968887c619e4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 80d0a961366ba61097c1e1b51ad47466984d734e + b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 240166714..066f0b330 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.8 @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 0.2.0 - 6.0.411-servicing.23316.46 - 6.0.411-servicing.23316.46 + 6.0.412-servicing.23319.33 + 6.0.412-servicing.23319.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23316.3 - 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.11 + 6.0.19-servicing.23316.11 6.0.19 6.0.19