From 1ea08b8f5f46b03d411c45c746417aabac737aaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 23:39:20 +0000 Subject: [PATCH] Merged PR 29730: [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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.115 to 6.0.115 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.115-servicing.23115.4 to 6.0.115-servicing.23117.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.115 to 6.0.115 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23074... --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d6950b95..ddb02c357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bbc60497..fe05582b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 0d02a9fc71d6e5da74daac3a136042f3790283b2 + 0c39542771ca202430d0042f710622b5b916ff0a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 78b6082f4..0660bf742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.115-servicing.23116.18 - 6.0.115-servicing.23116.18 + 6.0.115-servicing.23118.1 + 6.0.115-servicing.23118.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.15-servicing.23114.15 - 6.0.15-servicing.23114.15 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 6.0.15 6.0.15 6.0.15 @@ -78,8 +78,8 @@ - 6.0.15-servicing.23115.10 - 6.0.15-servicing.23115.10 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 6.0.15 6.0.15