From 280be9ad221ea9b6a59e6c85d4eb59c776272862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Mar 2022 21:52:21 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/runtime (#40853) [main] Update dependencies from dotnet/runtime - React to recent Logging nullability changes - main thing was `BeginScope(...)` can return `null` - see dotnet/runtime@ea4ebaa3c516 - see dotnet/runtime@103fb847f66f - Another nullability fixup --- eng/Version.Details.xml | 240 +++++++++--------- eng/Versions.props | 120 ++++----- .../src/Services/WebAssemblyConsoleLogger.cs | 2 +- .../Internal/HostingApplicationDiagnostics.cs | 2 +- .../Mvc.Core/src/MvcCoreLoggerExtensions.cs | 4 +- .../Internal/Infrastructure/KestrelTrace.cs | 2 +- 6 files changed, 185 insertions(+), 185 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afc9c59873c0..c08bf7640890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,252 +41,252 @@ https://github.com/dotnet/efcore 12bcdbdffbfbbda9226ddeea54adba7605601c37 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + c33d61412e372b26aa47640c00babd85a733f247 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5cf51e5ff0e1..1cf7fa8f2977 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,67 +63,67 @@ --> - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 - 7.0.0-preview.4.22172.7 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 + 7.0.0-preview.4.22174.1 - 7.0.0-preview.4.22172.7 + 7.0.0-preview.4.22174.1 7.0.0-preview.4.22173.5 7.0.0-preview.4.22173.5 diff --git a/src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyConsoleLogger.cs b/src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyConsoleLogger.cs index 5d26e425d6cb..39721ea8d5d0 100644 --- a/src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyConsoleLogger.cs +++ b/src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyConsoleLogger.cs @@ -30,7 +30,7 @@ public WebAssemblyConsoleLogger(string name, WebAssemblyJSRuntime jsRuntime) _jsRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime)); } - public IDisposable BeginScope(TState state) + public IDisposable? BeginScope(TState state) where TState : notnull { return NoOpDisposable.Instance; } diff --git a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs index 7042fbb7ed79..2085fd970bba 100644 --- a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs +++ b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs @@ -365,7 +365,7 @@ private void StopActivity(Activity activity, HttpContext httpContext) private static class Log { - public static IDisposable RequestScope(ILogger logger, HttpContext httpContext) + public static IDisposable? RequestScope(ILogger logger, HttpContext httpContext) { return logger.BeginScope(new HostingLogScope(httpContext)); } diff --git a/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs index cd8c3885931e..dc067944f283 100644 --- a/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs +++ b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs @@ -17,7 +17,7 @@ internal static partial class MvcCoreLoggerExtensions public const string ActionFilter = "Action Filter"; private static readonly string[] _noFilters = new[] { "None" }; - public static IDisposable ActionScope(this ILogger logger, ActionDescriptor action) + public static IDisposable? ActionScope(this ILogger logger, ActionDescriptor action) { return logger.BeginScope(new ActionLogScope(action)); } @@ -204,7 +204,7 @@ public static void AttemptingToBindModel(this ILogger logger, ModelBindingContex [LoggerMessage(24, LogLevel.Debug, "Attempting to bind model of type '{ModelType}' using the name '{ModelName}' in request data ...", EventName = "AttemptingToBindModel", SkipEnabledCheck = true)] private static partial void AttemptingToBindModel(ILogger logger, Type modelType, string modelName); - + public static void DoneAttemptingToBindModel(this ILogger logger, ModelBindingContext bindingContext) { if (!logger.IsEnabled(LogLevel.Debug)) diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs index ce3b2c224381..c8df0403ac4e 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs @@ -411,5 +411,5 @@ public void Log(LogLevel logLevel, EventId eventId, TState state, Except public bool IsEnabled(LogLevel logLevel) => _generalLogger.IsEnabled(logLevel); - public IDisposable BeginScope(TState state) => _generalLogger.BeginScope(state); + public IDisposable? BeginScope(TState state) where TState : notnull => _generalLogger.BeginScope(state); }