From 6a808a4c486bf5f6bcf69424b029d215937e11bb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jun 2022 14:52:37 +0000 Subject: [PATCH] Merged PR 23715: [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.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.7-servicing.22314.16 to 6.0.7-servicing.22322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.7-servicing.22314.5 to 6.0.7-servicing.22322.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.7-servicing.22321.2 to 6.0.7-servicing.22322.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220622.34 - **Date Produced**: June 23, 2022 5:04:19 AM UTC - **Commit**: 336044192d20c6c49968ffc53bbc8ca363bd94e8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22322.8 to 6.0.107-servicing.22322.34][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.7 to 6.0.7][6] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22321.2 to 6.0.7-servicing.2... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8fde6e36..f569adcbc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0806d52ee..fa80176e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 98e84064eac187f44cb1981bef60d5968678d3f0 + 657c81c5cd1ec6a66f64f3103d53047087a65163 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 154e31ec67d59c9fe885b8ea5c3148f45dbba2e9 + 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d168d16503879e3a8106394a5564fe97550e603f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8fb31b0f731d911fd9460780fab6134bf910befe + 336044192d20c6c49968ffc53bbc8ca363bd94e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6bdf005a9fdcade55cc00e6359e69b247740e097 + 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0aa6b816d..b7e5aecbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.7-servicing.22314.5 + 6.0.7-servicing.22322.3 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.2 @@ -46,18 +46,18 @@ 6.0.7 6.0.7 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 - 6.0.7-servicing.22314.16 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 + 6.0.7-servicing.22322.5 0.2.0 - 6.0.107-servicing.22322.8 - 6.0.107-servicing.22322.8 + 6.0.107-servicing.22322.34 + 6.0.107-servicing.22322.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.7-servicing.22321.2 - 6.0.7-servicing.22321.2 + 6.0.7-servicing.22322.3 + 6.0.7-servicing.22322.3 6.0.7 6.0.7