[Group 4] Enable nullable annotations for Microsoft.Extensions.Configuration.FileExtensions

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.cs

@@ -8,8 +8,8 @@ namespace Microsoft.Extensions.Configuration
 {
     public static partial class FileConfigurationExtensions
     {
-        public static System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> GetFileLoadExceptionHandler(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
-        public static Microsoft.Extensions.FileProviders.IFileProvider GetFileProvider(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
+        public static System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>? GetFileLoadExceptionHandler(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
+        public static Microsoft.Extensions.FileProviders.IFileProvider? GetFileProvider(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder) { throw null; }
         public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetBasePath(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, string basePath) { throw null; }
         public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetFileLoadExceptionHandler(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> handler) { throw null; }
         public static Microsoft.Extensions.Configuration.IConfigurationBuilder SetFileProvider(this Microsoft.Extensions.Configuration.IConfigurationBuilder builder, Microsoft.Extensions.FileProviders.IFileProvider fileProvider) { throw null; }
@@ -27,10 +27,10 @@ public override void Load() { }
     public abstract partial class FileConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
     {
         protected FileConfigurationSource() { }
-        public Microsoft.Extensions.FileProviders.IFileProvider FileProvider { get { throw null; } set { } }
-        public System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext> OnLoadException { get { throw null; } set { } }
+        public Microsoft.Extensions.FileProviders.IFileProvider? FileProvider { get { throw null; } set { } }
+        public System.Action<Microsoft.Extensions.Configuration.FileLoadExceptionContext>? OnLoadException { get { throw null; } set { } }
         public bool Optional { get { throw null; } set { } }
-        public string Path { get { throw null; } set { } }
+        public string? Path { get { throw null; } set { } }
         public int ReloadDelay { get { throw null; } set { } }
         public bool ReloadOnChange { get { throw null; } set { } }
         public abstract Microsoft.Extensions.Configuration.IConfigurationProvider Build(Microsoft.Extensions.Configuration.IConfigurationBuilder builder);
@@ -40,8 +40,8 @@ public void ResolveFileProvider() { }
     public partial class FileLoadExceptionContext
     {
         public FileLoadExceptionContext() { }
-        public System.Exception Exception { get { throw null; } set { } }
+        public System.Exception? Exception { get { throw null; } set { } }
         public bool Ignore { get { throw null; } set { } }
-        public Microsoft.Extensions.Configuration.FileConfigurationProvider Provider { get { throw null; } set { } }
+        public Microsoft.Extensions.Configuration.FileConfigurationProvider? Provider { get { throw null; } set { } }
     }
 }

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.cs" />
@@ -9,4 +10,8 @@
     <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" />
+  </ItemGroup>
 </Project>

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/FileConfigurationExtensions.cs

@@ -36,14 +36,14 @@ public static IConfigurationBuilder SetFileProvider(this IConfigurationBuilder b
         /// </summary>
         /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
         /// <returns>The default <see cref="IFileProvider"/>.</returns>
-        public static IFileProvider GetFileProvider(this IConfigurationBuilder builder)
+        public static IFileProvider? GetFileProvider(this IConfigurationBuilder builder)
         {
             if (builder == null)
             {
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            if (builder.Properties.TryGetValue(FileProviderKey, out object provider))
+            if (builder.Properties.TryGetValue(FileProviderKey, out object? provider))
             {
                 return provider as IFileProvider;
             }
@@ -94,14 +94,14 @@ public static IConfigurationBuilder SetFileLoadExceptionHandler(this IConfigurat
         /// </summary>
         /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
         /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static Action<FileLoadExceptionContext> GetFileLoadExceptionHandler(this IConfigurationBuilder builder)
+        public static Action<FileLoadExceptionContext>? GetFileLoadExceptionHandler(this IConfigurationBuilder builder)
         {
             if (builder == null)
             {
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            if (builder.Properties.TryGetValue(FileLoadExceptionHandlerKey, out object handler))
+            if (builder.Properties.TryGetValue(FileLoadExceptionHandlerKey, out object? handler))
             {
                 return handler as Action<FileLoadExceptionContext>;
             }

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/FileConfigurationProvider.cs

@@ -17,7 +17,7 @@ namespace Microsoft.Extensions.Configuration
     /// </summary>
     public abstract class FileConfigurationProvider : ConfigurationProvider, IDisposable
     {
-        private readonly IDisposable _changeTokenRegistration;
+        private readonly IDisposable? _changeTokenRegistration;
 
         /// <summary>
         /// Initializes a new instance with the specified source.
@@ -30,7 +30,7 @@ public FileConfigurationProvider(FileConfigurationSource source)
             if (Source.ReloadOnChange && Source.FileProvider != null)
             {
                 _changeTokenRegistration = ChangeToken.OnChange(
-                    () => Source.FileProvider.Watch(Source.Path),
+                    () => Source.FileProvider.Watch(Source.Path!),
                     () =>
                     {
                         Thread.Sleep(Source.ReloadDelay);
@@ -53,12 +53,12 @@ public override string ToString()
 
         private void Load(bool reload)
         {
-            IFileInfo file = Source.FileProvider?.GetFileInfo(Source.Path);
+            IFileInfo? file = Source.FileProvider?.GetFileInfo(Source.Path ?? string.Empty);
             if (file == null || !file.Exists)
             {
                 if (Source.Optional || reload) // Always optional on reload
                 {
-                    Data = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                    Data = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
                 }
                 else
                 {
@@ -100,7 +100,7 @@ static Stream OpenRead(IFileInfo fileInfo)
                 {
                     if (reload)
                     {
-                        Data = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                        Data = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
                     }
                     var exception = new InvalidDataException(SR.Format(SR.Error_FailedToLoad, file.PhysicalPath), ex);
                     HandleException(ExceptionDispatchInfo.Capture(exception));

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/FileConfigurationSource.cs

@@ -15,12 +15,12 @@ public abstract class FileConfigurationSource : IConfigurationSource
         /// <summary>
         /// Used to access the contents of the file.
         /// </summary>
-        public IFileProvider FileProvider { get; set; }
+        public IFileProvider? FileProvider { get; set; }
 
         /// <summary>
         /// The path to the file.
         /// </summary>
-        public string Path { get; set; }
+        public string? Path { get; set; }
 
         /// <summary>
         /// Determines if loading the file is optional.
@@ -41,7 +41,7 @@ public abstract class FileConfigurationSource : IConfigurationSource
         /// <summary>
         /// Will be called if an uncaught exception occurs in FileConfigurationProvider.Load.
         /// </summary>
-        public Action<FileLoadExceptionContext> OnLoadException { get; set; }
+        public Action<FileLoadExceptionContext>? OnLoadException { get; set; }
 
         /// <summary>
         /// Builds the <see cref="IConfigurationProvider"/> for this source.
@@ -56,8 +56,8 @@ public abstract class FileConfigurationSource : IConfigurationSource
         /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
         public void EnsureDefaults(IConfigurationBuilder builder)
         {
-            FileProvider = FileProvider ?? builder.GetFileProvider();
-            OnLoadException = OnLoadException ?? builder.GetFileLoadExceptionHandler();
+            FileProvider ??= builder.GetFileProvider();
+            OnLoadException ??= builder.GetFileLoadExceptionHandler();
         }
 
         /// <summary>
@@ -70,8 +70,8 @@ public void ResolveFileProvider()
                 !string.IsNullOrEmpty(Path) &&
                 System.IO.Path.IsPathRooted(Path))
             {
-                string directory = System.IO.Path.GetDirectoryName(Path);
-                string pathToFile = System.IO.Path.GetFileName(Path);
+                string? directory = System.IO.Path.GetDirectoryName(Path);
+                string? pathToFile = System.IO.Path.GetFileName(Path);
                 while (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
                 {
                     pathToFile = System.IO.Path.Combine(System.IO.Path.GetFileName(directory), pathToFile);
@@ -84,6 +84,5 @@ public void ResolveFileProvider()
                 }
             }
         }
-
     }
 }

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/FileLoadExceptionContext.cs

@@ -13,12 +13,12 @@ public class FileLoadExceptionContext
         /// <summary>
         /// The <see cref="FileConfigurationProvider"/> that caused the exception.
         /// </summary>
-        public FileConfigurationProvider Provider { get; set; }
+        public FileConfigurationProvider? Provider { get; set; }
 
         /// <summary>
         /// The exception that occurred in Load.
         /// </summary>
-        public Exception Exception { get; set; }
+        public Exception? Exception { get; set; }
 
         /// <summary>
         /// If true, the exception will not be rethrown.

src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj

@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);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>
     <PackageDescription>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</PackageDescription>
   </PropertyGroup>