From 003d294d7fc0c7f68dfca90c1a75f0acf7134e92 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Oct 2022 16:47:58 +0000 Subject: [PATCH 1/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-extensions build 20221014.1 Internal.AspNetCore.Analyzers , Microsoft.AspNetCore.Analyzer.Testing , Microsoft.AspNetCore.BenchmarkRunner.Sources , Microsoft.AspNetCore.Testing , Microsoft.Extensions.ActivatorUtilities.Sources , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Caching.SqlServer , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.CommandLineUtils.Sources , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.AzureKeyVault , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.KeyPerFile , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DiagnosticAdapter , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HashCodeCombiner.Sources , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Localization , Microsoft.Extensions.Localization.Abstractions , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.AzureAppServices , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.Testing , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.ObjectPool , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.ParameterDefaultValue.Sources , Microsoft.Extensions.Primitives , Microsoft.Extensions.TypeNameHelper.Sources , Microsoft.Extensions.ValueStopwatch.Sources , Microsoft.Extensions.WebEncoders , Microsoft.JSInterop From Version 3.1.30-servicing.22476.2 -> To Version 3.1.31-servicing.22514.1 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 3.1.30 -> To Version 3.1.31 (parent: Microsoft.Extensions.Logging --- NuGet.config | 6 + eng/Version.Details.xml | 244 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +-- 3 files changed, 137 insertions(+), 131 deletions(-) diff --git a/NuGet.config b/NuGet.config index 347eaf015c3..9362df8720d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,11 @@ + + + @@ -22,11 +25,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec4acb951c2..785b0f03dd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -33,85 +33,85 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b @@ -122,153 +122,153 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 9165b88e05fc37585aa1c3fc9585b5a7d751bb21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c62ee3d0c9492db518f79bf5e4d364bce7c78c66 + cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 6ea71919a5bbed566449efe09e953e78abcc5363 + 0e404aa9b868b6ad67321cb3a0a6161c25b966d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 6ea71919a5bbed566449efe09e953e78abcc5363 + 0e404aa9b868b6ad67321cb3a0a6161c25b966d4 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index e75b604e94f..639728a06ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.1.3 - 3.1.30 - 3.1.30 - 3.1.30 - 3.1.30 - 3.1.30 - 3.1.30-servicing.22476.2 - 3.1.30 + 3.1.31 + 3.1.31 + 3.1.31 + 3.1.31 + 3.1.31 + 3.1.31-servicing.22514.1 + 3.1.31 1.1.1 @@ -55,8 +55,8 @@ 3.1.6 3.1.25 3.1.0 - 3.1.30 - 3.1.30-servicing.22476.9 + 3.1.31 + 3.1.31-servicing.22513.7 2.1.0 From 7c72ec957e0888f222b9131d07618231eb1d5ad9 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 8 Nov 2022 10:50:57 -0800 Subject: [PATCH 2/3] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3e2b5a05b05..957bb9eb82c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.424", + "dotnet": "3.1.425", "runtimes": { "dotnet": [ "2.1.30", @@ -9,7 +9,7 @@ } }, "sdk": { - "version": "3.1.424" + "version": "3.1.425" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22512.2" From 3497e51c52d593c9a2a6ef673c351d01fe5bda8c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 8 Nov 2022 11:48:34 -0800 Subject: [PATCH 3/3] Update global.json --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 71c075ce452..1f5672153e1 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ - "3.1.30", + "3.1.31", "5.0.17" ], "aspnetcore": [ - "3.1.30", + "3.1.31", "5.0.17" ] } }, "sdk": { - "version": "6.0.110", + "version": "6.0.111", "allowPrerelease": true, "rollForward": "latestMajor" },