updating for v8 api changes

dansiegel · Aug 28, 2020 · 122d3fa · 122d3fa
1 parent f13c072
commit 122d3fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 44 deletions.
diff --git a/src/Prism.Container.Extensions/ContainerExtensionAttribute.cs b/src/Prism.Container.Extensions/ContainerExtensionAttribute.cs
diff --git a/src/Prism.Forms.Extended/Behaviors/ExtendedPageBehaviorFactory.cs b/src/Prism.Forms.Extended/Behaviors/ExtendedPageBehaviorFactory.cs
@@ -17,7 +17,7 @@ public ExtendedPageBehaviorFactory(IPageBehaviorFactoryOptions options)
             _options = options;
         }
 
-        public override void ApplyTabbedPageBehaviors(TabbedPage page)
+        protected override void ApplyTabbedPageBehaviors(TabbedPage page)
         {
             base.ApplyTabbedPageBehaviors(page);
 
@@ -37,7 +37,7 @@ public override void ApplyTabbedPageBehaviors(TabbedPage page)
             }
         }
 
-        public override void ApplyPageBehaviors(Page page)
+        protected override void ApplyPageBehaviors(Page page)
         {
             base.ApplyPageBehaviors(page);
 
@@ -47,7 +47,7 @@ public override void ApplyPageBehaviors(Page page)
             }
         }
 
-        public override void ApplyNavigationPageBehaviors(NavigationPage page)
+        protected override void ApplyNavigationPageBehaviors(NavigationPage page)
         {
             base.ApplyNavigationPageBehaviors(page);
 

diff --git a/src/Prism.Forms.Extended/PrismApplication.cs b/src/Prism.Forms.Extended/PrismApplication.cs
@@ -17,7 +17,6 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 
-[assembly: Prism.Container.Extensions.Preserve]
 [assembly: InternalsVisibleTo("Prism.DryIoc.Forms.Extended.Tests")]
 [assembly: InternalsVisibleTo("Prism.Microsoft.DependencyInjection.Forms.Extended.Tests")]
 [assembly: InternalsVisibleTo("Prism.Unity.Forms.Extended.Tests")]
@@ -51,7 +50,7 @@ protected override sealed void RegisterRequiredTypes(IContainerRegistry containe
 
         protected override IContainerExtension CreateContainerExtension()
         {
-            return ContainerLocator.Locate();
+            return ContainerLocator.Current ?? throw new NullReferenceException("Call PrismContainerExtension.Init() prior to initializing PrismApplication");
         }
 
         protected virtual void ConfigureAggregateLogger(IAggregateLogger aggregateLogger, IContainerProvider container)