From 9f111ce1a19301c2258920ba362206837c5ef8b0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 19:10:55 +0000 Subject: [PATCH] Merged PR 29164: [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.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (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**: 20230124.3 - **Date Produced**: January 24, 2023 6:41:34 PM UTC - **Commit**: c9ab6d88179966c84260fc580b27cdb719a7e918 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1312fab&targetVersion=GCc9ab6d8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCd40327a&targetVersion=GC9e190e3&_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 2c2dec53b85e..8d26843b5835 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 0a9bbb4b583f..434cf3df0731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 28fe85b51451..cedf49b021c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,11 +143,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3