From f1a405947785344bd1f4078525a61a82463c0671 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:11 +0000 Subject: [PATCH] Merged PR 30688: [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.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.16-servicing.23177.4 to 6.0.17-servicing.23213.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23174.6 to 6.0.17-servicing.23214.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23174.6 to 6.0.312-servicing.23213.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.312 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop... --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 46 +++++++++--------- 3 files changed, 85 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8fb2fb33..98ebbff1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,21 @@ + - - - + + - - - + - - - - + @@ -47,21 +42,16 @@ + - - - + + - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31fa15648..dc108d0d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + cf2cbab34d18c578eaced5a9429c6b2df3c471d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + 110c63b62d458c319cdaacca2dfd64fe677a3d55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + 876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + a4a285f074250f192ab49ecb4a80c9ce11adb7e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 93f3d085773bb5f0bac5a864c1e59c22625738ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest - 0c34747ff62ec59acb1579dfea5377acaf54027d + 5948b392c5d8c2580d08c9f6570409315243f86e @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://github.com/nuget/nuget.client - 51ca5ad938c742e6ff876ea1545b0712b130f9d1 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 diff --git a/eng/Versions.props b/eng/Versions.props index 278fe85d5..3224186bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23213.3 - 6.0.16-servicing.23175.3 + 6.0.17-servicing.23213.7 - 6.0.311 + 6.0.312 @@ -44,20 +44,20 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.17 + 6.0.17 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 + 6.0.17-servicing.23214.11 0.2.0 - 6.0.311-servicing.23177.16 - 6.0.311-servicing.23177.16 + 6.0.312-servicing.23215.2 + 6.0.312-servicing.23215.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 + 6.0.17 + 6.0.17 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23213.12 + 6.0.17-servicing.23213.12 + 6.0.17 + 6.0.17 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.311 + 6.0.312 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.1-release-20230323-13 + 17.2.1-release-20230405-01