[Group 6] Enable nullable annotations for Microsoft.Extensions.Loggin…

…g.Configuration (#67174)
dotnet · Apr 1, 2022 · fc7da6e · fc7da6e
1 parent 779de9b
commit fc7da6e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/...ft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/...ft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerFilterConfigureOptions.cs b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/LoggerFilterConfigureOptions.cs
@@ -57,13 +57,13 @@ private void LoadDefaultConfigValues(LoggerFilterOptions options)
             bool GetCaptureScopesValue(LoggerFilterOptions options) => _configuration.GetValue(nameof(options.CaptureScopes), options.CaptureScopes);
         }
 
-        private static void LoadRules(LoggerFilterOptions options, IConfigurationSection configurationSection, string logger)
+        private static void LoadRules(LoggerFilterOptions options, IConfigurationSection configurationSection, string? logger)
         {
-            foreach (System.Collections.Generic.KeyValuePair<string, string> section in configurationSection.AsEnumerable(true))
+            foreach (System.Collections.Generic.KeyValuePair<string, string?> section in configurationSection.AsEnumerable(true))
             {
                 if (TryGetSwitch(section.Value, out LogLevel level))
                 {
-                    string category = section.Key;
+                    string? category = section.Key;
                     if (category.Equals(DefaultCategory, StringComparison.OrdinalIgnoreCase))
                     {
                         category = null;
@@ -74,7 +74,7 @@ private static void LoadRules(LoggerFilterOptions options, IConfigurationSection
             }
         }
 
-        private static bool TryGetSwitch(string value, out LogLevel level)
+        private static bool TryGetSwitch(string? value, out LogLevel level)
         {
             if (string.IsNullOrEmpty(value))
             {

diff --git a/...ries/Microsoft.Extensions.Logging.Configuration/src/LoggerProviderConfigurationFactory.cs b/...ries/Microsoft.Extensions.Logging.Configuration/src/LoggerProviderConfigurationFactory.cs
@@ -16,15 +16,10 @@ public LoggerProviderConfigurationFactory(IEnumerable<LoggingConfiguration> conf
             _configurations = configurations;
         }
 
-        public IConfiguration GetConfiguration(Type providerType)
+        public IConfiguration GetConfiguration(Type providerType!!)
         {
-            if (providerType == null)
-            {
-                throw new ArgumentNullException(nameof(providerType));
-            }
-
-            string fullName = providerType.FullName;
-            string alias = ProviderAliasUtilities.GetAlias(providerType);
+            string fullName = providerType.FullName!;
+            string? alias = ProviderAliasUtilities.GetAlias(providerType);
             var configurationBuilder = new ConfigurationBuilder();
             foreach (LoggingConfiguration configuration in _configurations)
             {

diff --git a/...ft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/...ft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <Nullable>enable</Nullable>
     <EnableDefaultItems>true</EnableDefaultItems>
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>