Merge branch 'master' into merge/release/3.1-to-master

Commit migrated from dotnet/extensions@b55f0f8

src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreConfig.cs

@@ -34,6 +34,8 @@ public DefaultCoreConfig()
                 .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
 #elif NETCOREAPP3_1
                 .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
+#elif NETCOREAPP5_0
+                .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp5.0", null, ".NET Core 5.0")))
 #else
 #error Target frameworks need to be updated.
 #endif

src/libraries/Common/src/Extensions/TypeNameHelper/TypeNameHelper.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.Extensions.Internal
 {
-    internal class TypeNameHelper
+    internal static class TypeNameHelper
     {
         private const char DefaultNestedTypeDelimiter = '+';
 

src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs

@@ -42,7 +42,7 @@ public MsBuildTargetTest(ITestOutputHelper output)
 
         [Theory]
         [InlineData(".csproj", ".cs")]
-        [InlineData(".fsproj", ".fs")]
+        [InlineData(".fsproj", ".fs", Skip = "https://github.com/aspnet/AspNetCore/issues/13303")]
         public void GeneratesAssemblyAttributeFile(string projectExt, string sourceExt)
         {
             var testTfm = typeof(MsBuildTargetTest).Assembly

src/libraries/Microsoft.Extensions.Configuration/src/ChainedBuilderExtensions.cs

@@ -7,7 +7,7 @@
 namespace Microsoft.Extensions.Configuration
 {
     /// <summary>
-    /// IConfigurationBuilder extension methods for the chaind configuration provider.
+    /// Extension methods for adding <see cref="IConfiguration"/> to an <see cref="IConfigurationBuilder"/>.
     /// </summary>
     public static class ChainedBuilderExtensions
     {

src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs

@@ -452,7 +452,7 @@ public static ServiceDescriptor Singleton(
         /// <summary>
         /// Creates an instance of <see cref="ServiceDescriptor"/> with the specified
         /// <typeparamref name="TService"/>, <paramref name="implementationInstance"/>,
-        /// and the <see cref="ServiceLifetime.Scoped"/> lifetime.
+        /// and the <see cref="ServiceLifetime.Singleton"/> lifetime.
         /// </summary>
         /// <typeparam name="TService">The type of the service.</typeparam>
         /// <param name="implementationInstance">The instance of the implementation.</param>
@@ -471,7 +471,7 @@ public static ServiceDescriptor Singleton<TService>(TService implementationInsta
         /// <summary>
         /// Creates an instance of <see cref="ServiceDescriptor"/> with the specified
         /// <paramref name="serviceType"/>, <paramref name="implementationInstance"/>,
-        /// and the <see cref="ServiceLifetime.Scoped"/> lifetime.
+        /// and the <see cref="ServiceLifetime.Singleton"/> lifetime.
         /// </summary>
         /// <param name="serviceType">The type of the service.</param>
         /// <param name="implementationInstance">The instance of the implementation.</param>

src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderContainerTests.cs

@@ -346,6 +346,48 @@ public void ProviderScopeDisposeThrowsWhenOnlyDisposeAsyncImplemented()
                 exception.Message);
         }
 
+        [Fact]
+        public void SingletonServiceCreatedFromFactoryIsDisposedWhenContainerIsDisposed()
+        {
+            // Arrange
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton(_ => new FakeDisposable());
+            var serviceProvider = CreateServiceProvider(serviceCollection);
+
+            // Act
+            var service = serviceProvider.GetService<FakeDisposable>();
+            ((IDisposable)serviceProvider).Dispose();
+
+            // Assert
+            Assert.True(service.IsDisposed);
+        }
+
+        [Fact]
+        public void SingletonServiceCreatedFromInstanceIsNotDisposedWhenContainerIsDisposed()
+        {
+            // Arrange
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton(new FakeDisposable());
+            var serviceProvider = CreateServiceProvider(serviceCollection);
+
+            // Act
+            var service = serviceProvider.GetService<FakeDisposable>();
+            ((IDisposable)serviceProvider).Dispose();
+
+            // Assert
+            Assert.False(service.IsDisposed);
+        }
+
+        private class FakeDisposable : IDisposable
+        {
+            public bool IsDisposed { get; private set; }
+
+            public void Dispose()
+            {
+                IsDisposed = true;
+            }
+        }
+
         private class FakeMultipleServiceWithIEnumerableDependency: IFakeMultipleService
         {
             public FakeMultipleServiceWithIEnumerableDependency(IEnumerable<IFakeService> fakeServices)

src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs

@@ -88,17 +88,22 @@ public bool UsePollingFileWatcher
             {
                 if (_fileWatcher != null)
                 {
-                    throw new InvalidOperationException($"Cannot modify {nameof(UsePollingFileWatcher)} once file watcher has been initialized.");
+                    return false;
                 }
-
                 if (_usePollingFileWatcher == null)
                 {
                     ReadPollingEnvironmentVariables();
                 }
-
-                return _usePollingFileWatcher.Value;
+                return _usePollingFileWatcher ?? false;
+            }
+            set
+            {
+                if (_fileWatcher != null)
+                {
+                    throw new InvalidOperationException($"Cannot modify {nameof(UsePollingFileWatcher)} once file watcher has been initialized.");
+                }
+                _usePollingFileWatcher = value;
             }
-            set => _usePollingFileWatcher = value;
         }
 
         /// <summary>

src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs

@@ -1377,6 +1377,63 @@ public async Task WildCardToken_RaisesEventsWhenFileSystemWatcherDoesNotFire()
             }
         }
 
+        [Fact]
+        public void UsePollingFileWatcher_FileWatcherNull_SetsSuccessfully()
+        {
+            // Arrange
+            using (var root = new DisposableFileSystem())
+            {
+                using (var provider = new PhysicalFileProvider(root.RootPath))
+                {
+                    Assert.False(provider.UsePollingFileWatcher);
+
+                    // Act / Assert
+                    provider.UsePollingFileWatcher = true;
+                    Assert.True(provider.UsePollingFileWatcher);
+                }
+            }
+        }
+
+        [Fact]
+        public void UsePollingFileWatcher_FileWatcherNotNull_SetterThrows()
+        {
+            // Arrange
+            using (var root = new DisposableFileSystem())
+            {
+                using (var fileSystemWatcher = new MockFileSystemWatcher(root.RootPath))
+                {
+                    using (var physicalFilesWatcher = new PhysicalFilesWatcher(root.RootPath + Path.DirectorySeparatorChar, fileSystemWatcher, pollForChanges: false))
+                    {
+                        using (var provider = new PhysicalFileProvider(root.RootPath) { FileWatcher = physicalFilesWatcher })
+                        {
+                            // Act / Assert
+                            Assert.Throws<InvalidOperationException>(() => { provider.UsePollingFileWatcher = true; });
+                        }
+                    }
+                }
+            }
+        }
+
+        [Fact]
+        public void UsePollingFileWatcher_FileWatcherNotNull_ReturnsFalse()
+        {
+            // Arrange
+            using (var root = new DisposableFileSystem())
+            {
+                using (var fileSystemWatcher = new MockFileSystemWatcher(root.RootPath))
+                {
+                    using (var physicalFilesWatcher = new PhysicalFilesWatcher(root.RootPath + Path.DirectorySeparatorChar, fileSystemWatcher, pollForChanges: false))
+                    {
+                        using (var provider = new PhysicalFileProvider(root.RootPath) { FileWatcher = physicalFilesWatcher })
+                        {
+                            // Act / Assert
+                            Assert.False(provider.UsePollingFileWatcher);
+                        }
+                    }
+                }
+            }
+        }
+
         [Fact]
         public void CreateFileWatcher_CreatesWatcherWithPollingAndActiveFlags()
         {

src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/IHostApplicationLifetime.cs

@@ -6,7 +6,7 @@
 namespace Microsoft.Extensions.Hosting
 {
     /// <summary>
-    /// Allows consumers to be notified of application lifetime events.
+    /// Allows consumers to be notified of application lifetime events. This interface is not intended to be user-replaceable.
     /// </summary>
     public interface IHostApplicationLifetime
     {

src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs

@@ -55,7 +55,7 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic)
                     RuntimeFlavor.CoreClr,
                     RuntimeArchitecture.x64)
                 {
-                    TargetFramework = Tfm.NetCoreApp31,
+                    TargetFramework = Tfm.NetCoreApp50,
                     ApplicationType = ApplicationType.Portable,
                     PublishApplicationBeforeDeployment = true,
                     StatusMessagesEnabled = false

src/libraries/Microsoft.Extensions.Logging.Abstractions/src/ILogger.cs

@@ -25,7 +25,7 @@ public interface ILogger
         /// <summary>
         /// Checks if the given <paramref name="logLevel"/> is enabled.
         /// </summary>
-        /// <param name="logLevel">level to be checked.</param>
+        /// <param name="logLevel">Level to be checked.</param>
         /// <returns><c>true</c> if enabled.</returns>
         bool IsEnabled(LogLevel logLevel);
 

src/libraries/Microsoft.Extensions.Logging.EventLog/src/EventLogSettings.cs

@@ -18,7 +18,7 @@ public class EventLogSettings
         public string LogName { get; set; }
 
         /// <summary>
-        /// Name of the event log source. If <c>null</c> or not specified, "Application" is the default.
+        /// Name of the event log source. If <c>null</c> or not specified, ".NET Runtime" is the default.
         /// </summary>
         public string SourceName { get; set; }
 

src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/ConfigurationChangeTokenSource.cs

@@ -26,7 +26,7 @@ public ConfigurationChangeTokenSource(IConfiguration config) : this(Options.Defa
         /// <summary>
         /// Constructor taking the <see cref="IConfiguration"/> instance to watch.
         /// </summary>
-        /// <param name="name">The name of the options instance being watche.</param>
+        /// <param name="name">The name of the options instance being watched.</param>
         /// <param name="config">The configuration instance.</param>
         public ConfigurationChangeTokenSource(string name, IConfiguration config)
         {

src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.netcoreapp.cs

@@ -103,7 +103,7 @@ public partial interface IOptionsChangeTokenSource<out TOptions>
         string Name { get; }
         Microsoft.Extensions.Primitives.IChangeToken GetChangeToken();
     }
-    public partial interface IOptionsFactory<TOptions> where TOptions : class, new()
+    public partial interface IOptionsFactory<TOptions> where TOptions : class
     {
         TOptions Create(string name);
     }
@@ -120,11 +120,11 @@ public partial interface IOptionsMonitor<out TOptions>
         TOptions Get(string name);
         System.IDisposable OnChange(System.Action<TOptions, string> listener);
     }
-    public partial interface IOptionsSnapshot<out TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class, new()
+    public partial interface IOptionsSnapshot<out TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class
     {
         TOptions Get(string name);
     }
-    public partial interface IOptions<out TOptions> where TOptions : class, new()
+    public partial interface IOptions<out TOptions> where TOptions : class
     {
         TOptions Value { get; }
     }
@@ -139,7 +139,7 @@ public partial interface IValidateOptions<TOptions> where TOptions : class
     public static partial class Options
     {
         public static readonly string DefaultName;
-        public static Microsoft.Extensions.Options.IOptions<TOptions> Create<TOptions>(TOptions options) where TOptions : class, new() { throw null; }
+        public static Microsoft.Extensions.Options.IOptions<TOptions> Create<TOptions>(TOptions options) where TOptions : class { throw null; }
     }
     public partial class OptionsBuilder<TOptions> where TOptions : class
     {
@@ -179,13 +179,14 @@ public void Clear() { }
         public virtual bool TryAdd(string name, TOptions options) { throw null; }
         public virtual bool TryRemove(string name) { throw null; }
     }
-    public partial class OptionsFactory<TOptions> : Microsoft.Extensions.Options.IOptionsFactory<TOptions> where TOptions : class, new()
+    public partial class OptionsFactory<TOptions> : Microsoft.Extensions.Options.IOptionsFactory<TOptions> where TOptions : class
     {
         public OptionsFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>> setups, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>> postConfigures) { }
         public OptionsFactory(System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IConfigureOptions<TOptions>> setups, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IPostConfigureOptions<TOptions>> postConfigures, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IValidateOptions<TOptions>> validations) { }
         public TOptions Create(string name) { throw null; }
+        protected virtual TOptions CreateInstance(string name) { throw null; }
     }
-    public partial class OptionsManager<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions>, Microsoft.Extensions.Options.IOptionsSnapshot<TOptions> where TOptions : class, new()
+    public partial class OptionsManager<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions>, Microsoft.Extensions.Options.IOptionsSnapshot<TOptions> where TOptions : class
     {
         public OptionsManager(Microsoft.Extensions.Options.IOptionsFactory<TOptions> factory) { }
         public TOptions Value { get { throw null; } }
@@ -195,7 +196,7 @@ public static partial class OptionsMonitorExtensions
     {
         public static System.IDisposable OnChange<TOptions>(this Microsoft.Extensions.Options.IOptionsMonitor<TOptions> monitor, System.Action<TOptions> listener) { throw null; }
     }
-    public partial class OptionsMonitor<TOptions> : Microsoft.Extensions.Options.IOptionsMonitor<TOptions>, System.IDisposable where TOptions : class, new()
+    public partial class OptionsMonitor<TOptions> : Microsoft.Extensions.Options.IOptionsMonitor<TOptions>, System.IDisposable where TOptions : class
     {
         public OptionsMonitor(Microsoft.Extensions.Options.IOptionsFactory<TOptions> factory, System.Collections.Generic.IEnumerable<Microsoft.Extensions.Options.IOptionsChangeTokenSource<TOptions>> sources, Microsoft.Extensions.Options.IOptionsMonitorCache<TOptions> cache) { }
         public TOptions CurrentValue { get { throw null; } }
@@ -211,7 +212,7 @@ public OptionsValidationException(string optionsName, System.Type optionsType, S
         public string OptionsName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public System.Type OptionsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public partial class OptionsWrapper<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class, new()
+    public partial class OptionsWrapper<TOptions> : Microsoft.Extensions.Options.IOptions<TOptions> where TOptions : class
     {
         public OptionsWrapper(TOptions options) { }
         public TOptions Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }