Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/runtime (#40853)
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Mar 24, 2022
1 parent e00e8f9 commit 280be9a
Show file tree
Hide file tree
Showing 6 changed files with 185 additions and 185 deletions.
240 changes: 120 additions & 120 deletions eng/Version.Details.xml
View file

Large diffs are not rendered by default.

120 changes: 60 additions & 60 deletions eng/Versions.props
View file
Expand Up @@ -63,67 +63,67 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-preview.4.22172.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-preview.4.22172.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-preview.4.22172.7</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-preview.4.22172.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-preview.4.22172.7</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-preview.4.22172.7</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-preview.4.22172.7</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>7.0.0-preview.4.22172.7</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-preview.4.22172.7</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-preview.4.22172.7</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>7.0.0-preview.4.22172.7</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>7.0.0-preview.4.22172.7</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-preview.4.22172.7</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-preview.4.22172.7</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-preview.4.22172.7</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-preview.4.22172.7</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-preview.4.22172.7</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-preview.4.22172.7</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>7.0.0-preview.4.22172.7</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>7.0.0-preview.4.22172.7</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.0-preview.4.22172.7</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-preview.4.22174.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-preview.4.22174.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-preview.4.22174.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-preview.4.22174.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-preview.4.22174.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-preview.4.22174.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-preview.4.22174.1</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>7.0.0-preview.4.22174.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-preview.4.22174.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-preview.4.22174.1</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>7.0.0-preview.4.22174.1</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>7.0.0-preview.4.22174.1</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-preview.4.22174.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-preview.4.22174.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-preview.4.22174.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-preview.4.22174.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-preview.4.22174.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-preview.4.22174.1</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>7.0.0-preview.4.22174.1</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>7.0.0-preview.4.22174.1</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.0-preview.4.22174.1</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.0-preview.4.22172.7</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>7.0.0-preview.4.22174.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>7.0.0-preview.4.22173.5</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-preview.4.22173.5</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyConsoleLogger.cs
View file
Expand Up @@ -30,7 +30,7 @@ public WebAssemblyConsoleLogger(string name, WebAssemblyJSRuntime jsRuntime)
_jsRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
}

public IDisposable BeginScope<TState>(TState state)
public IDisposable? BeginScope<TState>(TState state) where TState : notnull
{
return NoOpDisposable.Instance;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs
View file
Expand Up @@ -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));
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs
View file
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs
View file
Expand Up @@ -411,5 +411,5 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except

public bool IsEnabled(LogLevel logLevel) => _generalLogger.IsEnabled(logLevel);

public IDisposable BeginScope<TState>(TState state) => _generalLogger.BeginScope(state);
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => _generalLogger.BeginScope(state);
}

0 comments on commit 280be9a

Please sign in to comment.