From 597ab8665d3b6fa5d1bad36724a3303aac430a5e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 21:27:32 +0000 Subject: [PATCH] Merged PR 31458: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop 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.NET.Sdk.WindowsDesktop**: from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20230522.2 - **Date Produced**: May 22, 2023 4:44:54 PM UTC - **Commit**: 44b3a005f161dfc735446e61cbf1e792124170da - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC6cc1fd96eb&targetVersion=GC44b3a005f1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7cd35b1648&targetVersion=GCa29a62bc7a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec3f86fd7355..298a95c939c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1020ec347a29..e334dfeabf62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6cc1fd96eb2b8be53291236de88a007ac81f99bf + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7cd35b1648ac297ea6404c1f7645aaae8a216938 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5f0defb2018e..a7554542285d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,11 +143,11 @@ - 6.0.18-servicing.23269.6 + 6.0.18-servicing.23272.2 - 6.0.18-servicing.23269.7 + 6.0.18-servicing.23272.2