From 7128856a2f6059b80c4ffb0817c0e3825f289089 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 22:47:48 +0000 Subject: [PATCH] Merged PR 22674: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220511.22 - **Date Produced**: May 12, 2022 4:28:10 AM UTC - **Commit**: ec869831f5bb2575270c66f8af8e456bf7c3f1ce - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22252.7 to 6.0.106-servicing.22261.22][10] - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22252.7 to 6.0.106-servicing.22261.22][10] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.6][11] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6][11] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6][11] - **Microsoft.NETCore.App.Ref**: [from 6.0.5 to 6.0.6][12] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10][12] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][12] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.5 to 6.0.6][12] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.5 to 6.0.6][12] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.6][13] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][13] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **dotnet-dev-certs**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **dotnet-user-secrets**: [from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10][13] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.105 to 6.0.106][14] - **Microsoft.TemplateEngine.Cli**: [from 6.0.105-servicing.22214.6 to 6.0.106-servicing.22255.5][14] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.105 to 6.0.106][14] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][11] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.5-servicing.22214.3 to 6.0.6-servicing.22255.2][15] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][11] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.5-servicing.22215.11 to 6.0.6-servicing.22255.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10][12] [10]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1fe572d&targetVersion=GCec86983&_a=files [11]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC65aaba1&targetVersion=GCbc63032&_a=fil... --- NuGet.config | 28 ++++--------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05db78f03..df1f6804d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,20 @@ - - - + - - - + - - - + - + @@ -47,21 +41,15 @@ - - - + - - - + - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d9e9a0f5..35ac15a00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 65aaba15166a6e676ec1be6b6ab2f43c2916d4ee + bc63032a084340c7ac42b47fecb9dc0b4d0c9373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 22095cd47b192aa48ca82c514e547cc528aebd9d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e5f183b656a0e8bc087108130a5a9b54ae94494e + 09f40738cea0abc19e06851eb2180e4724870288 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed + b86c7ffc4fd4cf0931abf3c14b43c16bcb5853f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fe572daeeb0436176253f5b54f5591816d6c85e + ec869831f5bb2575270c66f8af8e456bf7c3f1ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fe572daeeb0436176253f5b54f5591816d6c85e + ec869831f5bb2575270c66f8af8e456bf7c3f1ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a59b5f3bcf2013b0681089930dd18c65f33ec202 + 83daf50cbdf69c702829df567ac0d737007083ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89dcce82c0690a9ac94a83594d714e53957a395d + 736757c0193667dc19c6d9d132d93a52cc8e4805 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b7a4188d6..e26fe6829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.5-servicing.22214.3 + 6.0.6-servicing.22255.2 - 6.0.5-servicing.22215.11 + 6.0.6-servicing.22255.5 - 6.0.105 + 6.0.106 @@ -44,20 +44,20 @@ - 6.0.5 - 6.0.5 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 - 6.0.5-servicing.22218.2 + 6.0.6 + 6.0.6 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 + 6.0.6-servicing.22260.10 0.2.0 - 6.0.105-servicing.22252.7 - 6.0.105-servicing.22252.7 + 6.0.106-servicing.22261.22 + 6.0.106-servicing.22261.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.5-servicing.22213.9 - 6.0.5-servicing.22213.9 - 6.0.5 - 6.0.5 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22255.10 + 6.0.6-servicing.22255.10 + 6.0.6 + 6.0.6 + 6.0.6 + 6.0.6 2.1.0 - 6.0.5-servicing.22227.2 - 6.0.5-servicing.22227.2 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22260.6 + 6.0.6-servicing.22260.6 + 6.0.6 + 6.0.6 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.105 + 6.0.106 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)