From 98c3e32451300747fb3d8c5d1407fdd80d0b2b92 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 20:43:21 +0000 Subject: [PATCH] Merged PR 31327: [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.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23261.3 to 6.0.18-servicing.23267.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23266.5 to 6.0.18-servicing.23266.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.18-servicing.23266.7 to 6.0.18-servicing.23267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.18-servicing.23258.5 to 6.0.18-servicing.23261.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2... --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5addf7d71..e6b836bc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25aeedd4e..6c605f6ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7882d4d3dc6f9e10a539b3bf233a8d50c4fc39f8 + 822d7be63c77a447a8c72234a478a7ddc2101217 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9fa9da7badeacc7c8e89547a466b92232ae127bf + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3d33aeef3a5c521114e067c8078f4069c6598fc3 + 7195ea21f172746226a84887af2fd0742d8439f8 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 85e4c2824577397d49037ae98fc601f4fd9e3ccb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326ba9e30e560c6d20c18f60394d1af5523b5a01 + beb9b36629d3628fa469e87853cc2a6cca880c53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + 24e38444348603b9b97149b5e3ffb73f7baddc85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd8f52b18e0976ce565161b6603b7ffc8f0b5153 + 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed23edb1a..54ff10e4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23252.5 - 6.0.18-servicing.23258.5 + 6.0.18-servicing.23261.2 @@ -46,30 +46,30 @@ 6.0.18 6.0.18 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 - 6.0.18-servicing.23266.7 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 + 6.0.18-servicing.23267.15 0.2.0 - 6.0.410-servicing.23267.19 - 6.0.410-servicing.23267.19 + 6.0.410-servicing.23268.2 + 6.0.410-servicing.23268.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.18-servicing.23266.5 - 6.0.18-servicing.23266.5 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 6.0.18 6.0.18 6.0.18 @@ -78,8 +78,8 @@ - 6.0.18-servicing.23261.3 - 6.0.18-servicing.23261.3 + 6.0.18-servicing.23267.2 + 6.0.18-servicing.23267.2 6.0.18 6.0.18