From c74f58b3e055436a7425711b181750b942d0ffaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:18:29 +0000 Subject: [PATCH] Merged PR 26035: [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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22469.18 to 6.0.402-rtm.22470.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: ... --- NuGet.config | 12 ++++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae933ee91..6ef2f2d6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,12 +16,13 @@ + - + - + @@ -43,13 +45,15 @@ + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c1a493d..a4720d6aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index da4fa4576..35666876f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 @@ -44,42 +44,42 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.402-servicing.22470.13 - 6.0.402-servicing.22470.13 + 6.0.402-servicing.22470.37 + 6.0.402-servicing.22470.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.10-servicing.22464.9 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 6.0.10 6.0.10