chore: removing FinalizeExtension

PrismLibrary · Jan 4, 2024 · 899eb64 · 899eb64
1 parent 86d52d8
commit 899eb64
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/src/Forms/Prism.Forms/PrismApplicationBase.cs b/src/Forms/Prism.Forms/PrismApplicationBase.cs
@@ -102,7 +102,7 @@ protected virtual void ConfigureViewModelLocator()
         {
             ViewModelLocationProvider.SetDefaultViewModelFactory((view, type) =>
             {
-                List<(Type Type, object Instance)> overrides = new List<(Type, object)>();
+                List<(Type Type, object Instance)> overrides = [];
                 if (Container.IsRegistered<IResolverOverridesHelper>())
                 {
                     var resolver = Container.Resolve<IResolverOverridesHelper>();
@@ -148,8 +148,6 @@ protected virtual void Initialize()
                 PlatformInitializer?.RegisterTypes(_containerExtension);
                 RegisterTypes(_containerExtension);
 
-                _containerExtension.FinalizeExtension();
-
                 _moduleCatalog = Container.Resolve<IModuleCatalog>();
                 ConfigureModuleCatalog(_moduleCatalog);
             }

diff --git a/src/Maui/Prism.Maui/PrismAppBuilder.cs b/src/Maui/Prism.Maui/PrismAppBuilder.cs
@@ -27,12 +27,12 @@ public sealed class PrismAppBuilder
 
     internal PrismAppBuilder(IContainerExtension containerExtension, MauiAppBuilder builder)
     {
-        if (containerExtension is null)
-            throw new ArgumentNullException(nameof(containerExtension));
+        ArgumentNullException.ThrowIfNull(containerExtension);
+        ArgumentNullException.ThrowIfNull(builder);
 
         _container = containerExtension;
-        _registrations = new List<Action<IContainerRegistry>>();
-        _initializations = new List<Action<IContainerProvider>>();
+        _registrations = [];
+        _initializations = [];
 
         ViewModelCreationException.SetViewNameDelegate(view =>
         {
@@ -89,7 +89,7 @@ internal PrismAppBuilder(IContainerExtension containerExtension, MauiAppBuilder
     /// </summary>
     public MauiAppBuilder MauiBuilder { get; }
 
-    private void ConfigureViewModelLocator()
+    private static void ConfigureViewModelLocator()
     {
         ViewModelLocationProvider.SetDefaultViewToViewModelTypeResolver(view =>
         {

diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs
@@ -126,7 +126,6 @@ protected virtual void Initialize(IApplicationBuilder builder)
             _containerExtension.RegisterInstance(builder.Window);
             RegisterRequiredTypes(_containerExtension);
             RegisterTypes(_containerExtension);
-            _containerExtension.FinalizeExtension();
 
             ConfigureModuleCatalog(Container.Resolve<IModuleCatalog>());
 

diff --git a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs
@@ -61,7 +61,6 @@ protected virtual void Initialize()
             _moduleCatalog = CreateModuleCatalog();
             RegisterRequiredTypes(_containerExtension);
             RegisterTypes(_containerExtension);
-            _containerExtension.FinalizeExtension();
 
             ConfigureModuleCatalog(_moduleCatalog);
 

diff --git a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs
@@ -58,7 +58,6 @@ protected virtual void Initialize()
             _moduleCatalog = CreateModuleCatalog();
             RegisterRequiredTypes(_containerExtension);
             RegisterTypes(_containerExtension);
-            _containerExtension.FinalizeExtension();
 
             ConfigureModuleCatalog(_moduleCatalog);
 

diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Ioc/ContainerProviderExtensionFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Ioc/ContainerProviderExtensionFixture.cs
@@ -36,7 +36,6 @@ static ContainerProviderExtensionFixture()
             {
                 _containerExtension.RegisterInstance<IService>(kvp.Value, kvp.Key);
             }
-            _containerExtension.FinalizeExtension();
         }
 
         public ContainerProviderExtensionFixture()