From b8cb60edae8ea694b2a05707eb3c005deb5da793 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 20:51:31 +0000 Subject: [PATCH] Merged PR 32122: [internal/release/6.0.3xx] 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.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.314-servicing.23316.16 to 6.0.315-servicing.23320.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (B... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad23de3e8..49bd305f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1a6a14eb..9035638c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 diff --git a/eng/Versions.props b/eng/Versions.props index 756b5ea96..e38d20678 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.314 + 6.0.315 @@ -44,20 +44,20 @@ - 6.0.19 - 6.0.19 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 0.2.0 - 6.0.315-servicing.23319.32 - 6.0.315-servicing.23319.32 + 6.0.315-servicing.23321.9 + 6.0.315-servicing.23321.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.19-servicing.23316.11 - 6.0.19-servicing.23316.11 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23319.7 + 6.0.20-servicing.23319.7 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.314 + 6.0.315 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion)