Changed from OptionsManager<> to the new UnnamedOptionsManager<>

Author: kalintsenkov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs

@@ -20,7 +20,8 @@ private static IWebHostEnvironment PrepareEnvironment()
                 ApplicationName = ApplicationName,
                 EnvironmentName = ServerTestConfiguration.General.EnvironmentName,
                 ContentRootPath = AppContext.BaseDirectory,
-                WebRootFileProvider = new NullFileProvider()
+                WebRootFileProvider = new NullFileProvider(),
+                ContentRootFileProvider = new NullFileProvider()
             };
 
         internal static void ResetConfigurationAndAssemblies()

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs

@@ -7,7 +7,7 @@
     public static class TestFramework
     {
         public const string TestFrameworkName = "MyTested.AspNetCore.Mvc";
-        public const string ReleaseDate = "2022-03-11";
+        public const string ReleaseDate = "2022-12-28";
         public const string VersionPrefix = "6.0";
 
         internal static void EnsureCorrectVersion(DependencyContext dependencyContext)

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs

@@ -8,6 +8,7 @@
     using Microsoft.EntityFrameworkCore;
     using Microsoft.EntityFrameworkCore.Infrastructure;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.DependencyInjection.Extensions;
     using Utilities.Extensions;
 
     /// <summary>
@@ -62,7 +63,7 @@ public static IServiceCollection ReplaceDbContext(this IServiceCollection servic
                         .MakeGenericMethod(existingDbContextService.ServiceType, existingDbContextService.ImplementationType)
                         .Invoke(null, new object[] { serviceCollection });
                 });
-            
+
             TestServiceProvider.SaveServiceLifetime(BaseDbContextType, ServiceLifetime.Scoped);
 
             return serviceCollection;
@@ -75,7 +76,7 @@ private static void AddScopedDatabase<TDbContextService, TDbContextImplementatio
 
             if (typeof(TDbContextService) != typeof(TDbContextImplementation))
             {
-                serviceCollection.AddScoped(s => s.GetRequiredService<TDbContextService>() as TDbContextImplementation);
+                serviceCollection.TryAddScoped(s => s.GetRequiredService<TDbContextService>() as TDbContextImplementation);
 
                 TestServiceProvider.SaveServiceLifetime<TDbContextImplementation>(ServiceLifetime.Scoped);
             }

src/MyTested.AspNetCore.Mvc.Options/Plugins/OptionsTestPlugin.cs

@@ -6,15 +6,16 @@
 
     public class OptionsTestPlugin : IServiceRegistrationPlugin
     {
+        private const string DefaultOptionsImplementationTypeFullName = "Microsoft.Extensions.Options.UnnamedOptionsManager`1";
+
         private readonly Type defaultOptionsServiceType = typeof(IOptions<>);
-        private readonly Type defaultOptionsImplementationType = typeof(OptionsManager<>);
-        
+
         public Func<ServiceDescriptor, bool> ServiceSelectorPredicate
             => serviceDescriptor =>
                 serviceDescriptor.ServiceType == this.defaultOptionsServiceType &&
-                serviceDescriptor.ImplementationType == this.defaultOptionsImplementationType;
+                serviceDescriptor.ImplementationType?.FullName == DefaultOptionsImplementationTypeFullName;
 
-        public Action<IServiceCollection> ServiceRegistrationDelegate 
+        public Action<IServiceCollection> ServiceRegistrationDelegate
             => serviceCollection => serviceCollection.ReplaceOptions();
     }
 }

test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs

@@ -33,7 +33,7 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection()
 
             testPlugin.DefaultServiceRegistrationDelegate(serviceCollection);
 
-            Assert.True(serviceCollection.Count == 160);        
+            Assert.True(serviceCollection.Count == 165);
         }
     }
 }