From a17784c3acf21025295ead816f5877a522eb66d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 14:11:31 -0700 Subject: [PATCH] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12499) * Update dependencies from https://github.com/dotnet/sdk build 20211022.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21522.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211023.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21523.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk * Update NuGet.config Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell --- NuGet.config | 11 +++-- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++------- 3 files changed, 67 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 896cfacca..a78870529 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,10 +16,13 @@ - + + + + - + @@ -34,6 +37,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1800c4c82..8c7b22a63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 https://github.com/dotnet/windowsdesktop - d7c81e8f2baee9be046718a2c977b6ce225b5fca + 59fea7da1dbb6e48837fa726cc2760b154bce3d1 - + https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 @@ -50,32 +50,32 @@ https://github.com/dotnet/runtime - de751593a53e9ccaffef2420ad3d74727cad47aa + 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 - + https://github.com/dotnet/aspnetcore - d67b17cc26d19b5d0d045cf4379d92ca9dd02417 + 6fb6d9f7295165bb61e9fa3e690b55b4bbb0f121 https://github.com/dotnet/test-templates @@ -90,44 +90,44 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/templating - afb8dfb313ad614fb1f13bde72e7c965ad219990 + 7fd55c5e0bb34312f698a5e3f77e8d894fc37f1d - + https://github.com/dotnet/sdk - a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 + 9f05f7d3af55f7ad5928d9ee10a47c14af026489 - + https://github.com/dotnet/sdk - a7c88c78eed48e6889df60b7d9b1f03f2e7b0833 + 9f05f7d3af55f7ad5928d9ee10a47c14af026489 - + https://github.com/dotnet/winforms - b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc + d43e35d5224f12a335ff1a62d01e86b18a22d657 - + https://github.com/dotnet/wpf - 521865989ee4b5498da5305f7f82b721c1df0b03 + 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/dotnet/fsharp - 4bfc2b74e5d31242e5a050f44cacdfe8fc2a2b83 + 6d626ff0752a77d339f609b4d361787dc9ca93a5 @@ -151,9 +151,9 @@ c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 - + https://github.com/nuget/nuget.client - e3016693e01536996921d613152648d66eb0ce99 + 078701b97eeef2283c1f4605032b5bcf55a80653 diff --git a/eng/Versions.props b/eng/Versions.props index d1fd17426..37f95b580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rtm.21522.1 + 6.0.0-rtm.21523.1 - 6.0.0-rtm.21522.2 + 6.0.0-rtm.21523.1 - 6.0.100-rtm.21521.1 + 6.0.100 @@ -46,18 +46,18 @@ 6.0.0 6.0.0 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 - 6.0.0-rtm.21521.10 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 + 6.0.0-rtm.21523.2 0.2.0 - 6.0.100-rtm.21522.10 - 6.0.100-rtm.21522.10 + 6.0.100-rtm.21523.3 + 6.0.100-rtm.21523.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.0-rtm.21521.6 - 6.0.0-rtm.21521.6 + 6.0.0-rtm.21522.10 + 6.0.0-rtm.21522.10 6.0.0 6.0.0 6.0.0 @@ -78,8 +78,8 @@ - 6.0.0-rtm.21522.2 - 6.0.0-rtm.21522.2 + 6.0.0-rtm.21523.1 + 6.0.0-rtm.21523.1 6.0.0 6.0.0 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100-rtm.21521.1 + 6.0.100 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)