Merge pull request #165 from dansiegel/prism8-releasecandidate

Prism 8 - Updates

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "3.1.300",
+      "version": "3.1.404",
       "rollForward": "latestMinor",
       "allowPrerelease": false
     },

sample/PrismSample.Android/PrismSample.Android.csproj

@@ -53,7 +53,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
   </ItemGroup>
   <ItemGroup>

sample/PrismSample.Android/Properties/AssemblyInfo.cs

@@ -16,19 +16,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
 // Add some common permissions, these can be removed if not needed
 [assembly: UsesPermission(Android.Manifest.Permission.Internet)]
 [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]

sample/PrismSample.UWP/PrismSample.UWP.csproj

@@ -143,7 +143,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.10" />
   </ItemGroup>
   <ItemGroup>

sample/PrismSample.UWP/Properties/AssemblyInfo.cs

@@ -14,16 +14,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]

sample/PrismSample.iOS/AppDelegate.cs

@@ -6,11 +6,11 @@
 using UIKit;
 using Shiny;
 using PrismSample.Shiny;
-using PreserveAttribute = Prism.DryIoc.PreserveAttribute;
+using Prism.DryIoc.Internals;
 
 // Force the assembly into the App Domain
 // Required for the Sample... this should be brought in automatically for NuGet references
-[assembly: Preserve(typeof(PrismContainerExtension))]
+[assembly: PrismContainerExtension]
 namespace PrismSample.iOS
 {
     // The UIApplicationDelegate for the application. This class is responsible for launching the 

sample/PrismSample.iOS/PrismSample.iOS.csproj

@@ -125,7 +125,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

sample/PrismSample.iOS/Properties/AssemblyInfo.cs

@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

sample/PrismSample/PrismSample.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1269" />
+    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
   </ItemGroup>
 
   <ItemGroup>

src/Prism.Container.Extensions/Internals/ContainerExtensionAttribute.cs

@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel;
+using Prism.Ioc;
+
+namespace Prism.Container.Extensions.Internals
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public abstract class ContainerExtensionAttribute : Attribute
+    {
+        public IContainerExtension GetContainer()
+        {
+            var container = Init();
+            ContainerLocator.SetContainerExtension(() => container);
+            return ContainerLocator.Current;
+        }
+
+        protected abstract IContainerExtension Init();
+    }
+}

src/Prism.Container.Extensions/Internals/ContainerLocationHelper.cs

@@ -0,0 +1,28 @@
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using Prism.Ioc;
+
+namespace Prism.Container.Extensions.Internals
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class ContainerLocationHelper
+    {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IContainerExtension LocateContainer(IContainerExtension container = null)
+        {
+            if(container != null)
+            {
+                ContainerLocator.SetContainerExtension(() => container);
+            }
+
+            var located = ContainerLocator.Current;
+            if (located != null)
+                return located;
+
+            var entryAssembly = Assembly.GetEntryAssembly();
+            var containerExtensionAttribute = entryAssembly.GetCustomAttributes().OfType<ContainerExtensionAttribute>().FirstOrDefault();
+            return containerExtensionAttribute?.GetContainer();
+        }
+    }
+}

src/Prism.Container.Extensions/Prism.Container.Extensions.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.10" />
     <PackageReference Include="Prism.Core" Version="8.0.0.1909" />
   </ItemGroup>
 

src/Prism.DryIoc.Extensions/Internals/PrismContainerExtensionAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using System.ComponentModel;
+using Prism.Container.Extensions.Internals;
+using Prism.Ioc;
+
+namespace Prism.DryIoc.Internals
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class PrismContainerExtensionAttribute : ContainerExtensionAttribute
+    {
+        protected override IContainerExtension Init() => PrismContainerExtension.Init();
+    }
+}

src/Prism.DryIoc.Extensions/Prism.DryIoc.Extensions.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="4.3.3" />
+    <PackageReference Include="DryIoc.dll" Version="4.5.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Prism.DryIoc.Extensions/build/PreserveContainerExtension.cs

@@ -1,5 +1,4 @@
-using Prism.DryIoc;
+using Prism.DryIoc.Internals;
 
 // Force the assembly into the App Domain
-[assembly: Preserve(typeof(global::Prism.DryIoc.PrismContainerExtension))]
-[assembly: Preserve(typeof(global::DryIoc.Container))]
+[assembly: PrismContainerExtension]

src/Prism.Forms.Extended/Prism.Forms.Extended.csproj

@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Prism.Forms" Version="8.0.0.1850-pre" />
+    <PackageReference Include="Prism.Forms" Version="8.0.0.1909" />
     <PackageReference Include="Prism.Plugin.Logging.Abstractions" Version="8.0.11-beta" />
   </ItemGroup>
 

src/Prism.Forms.Extended/PrismApplication.cs

@@ -6,6 +6,7 @@
 using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Threading.Tasks;
+using Prism.Container.Extensions.Internals;
 using Prism.Events;
 using Prism.Forms.Extended.ViewModels;
 using Prism.Ioc;
@@ -44,7 +45,8 @@ protected override void RegisterRequiredTypes(IContainerRegistry containerRegist
 
         protected override IContainerExtension CreateContainerExtension()
         {
-            return ContainerLocator.Current ?? throw new NullReferenceException("Call PrismContainerExtension.Init() prior to initializing PrismApplication");
+            return ContainerLocationHelper.LocateContainer() ??
+                throw new NullReferenceException("Call PrismContainerExtension.Init() prior to initializing PrismApplication");
         }
 
         protected sealed override void InitializeModules()

src/Prism.Forms.Extended/ViewModels/DefaultViewModel.cs

@@ -1,15 +1,24 @@
-using Prism.AppModel;
-using Prism.Mvvm;
+using Prism.Mvvm;
+using Prism.Navigation;
 
 namespace Prism.Forms.Extended.ViewModels
 {
-    internal class DefaultViewModel : BindableBase, IAutoInitialize
+    internal class DefaultViewModel : BindableBase, IInitialize
     {
         private string _title;
         public string Title
         {
             get => _title;
             set => SetProperty(ref _title, value);
         }
+
+        public void Initialize(INavigationParameters parameters)
+        {
+            if(parameters.TryGetValue("Title", out string title) ||
+                parameters.TryGetValue("title", out title))
+            {
+                Title = title;
+            }
+        }
     }
 }

src/Prism.Microsoft.DependencyInjection.Extensions/Internals/PrismContainerExtensionAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using System.ComponentModel;
+using Prism.Container.Extensions.Internals;
+using Prism.Ioc;
+
+namespace Prism.Microsoft.DependencyInjection.Internals
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class PrismContainerExtensionAttribute : ContainerExtensionAttribute
+    {
+        protected override IContainerExtension Init() => PrismContainerExtension.Init();
+    }
+}

src/Prism.Microsoft.DependencyInjection.Extensions/Prism.Microsoft.DependencyInjection.Extensions.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.10" />
   </ItemGroup>
 
   <ItemGroup>

src/Prism.Microsoft.DependencyInjection.Extensions/build/PreserveContainerExtension.cs

@@ -1,6 +1,4 @@
-using Prism.Microsoft.DependencyInjection;
+using Prism.Microsoft.DependencyInjection.Internals;
 
 // Force the assembly into the App Domain
-[assembly: Preserve(typeof(global::Prism.Microsoft.DependencyInjection.PrismContainerExtension))]
-[assembly: Preserve(typeof(global::Microsoft.Extensions.DependencyInjection.ServiceCollection))]
-[assembly: Preserve(typeof(global::Microsoft.Extensions.DependencyInjection.ServiceProvider))]
+[assembly: PrismContainerExtension]

src/Prism.Unity.Extensions/Internals/PrismContainerExtensionAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using System.ComponentModel;
+using Prism.Container.Extensions.Internals;
+using Prism.Ioc;
+
+namespace Prism.Unity.Internals
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class PrismContainerExtensionAttribute : ContainerExtensionAttribute
+    {
+        protected override IContainerExtension Init() => PrismContainerExtension.Init();
+    }
+}

src/Prism.Unity.Extensions/Prism.Unity.Extensions.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Unity.Container" Version="5.11.8" />
+    <PackageReference Include="Unity.Container" Version="5.11.10" />
   </ItemGroup>
 
   <ItemGroup>

src/Prism.Unity.Extensions/build/PreserveContainerExtension.cs

@@ -1,5 +1,4 @@
-using Prism.Unity;
+using Prism.Unity.Internals;
 
 // Force the assembly into the App Domain
-[assembly: Preserve(typeof(global::Prism.Unity.PrismContainerExtension))]
-[assembly: Preserve(typeof(global::Unity.UnityContainer))]
+[assembly: PrismContainerExtension]

src/Shiny.Prism/Modularity/ShinyPrismModuleInitializer.cs

@@ -25,7 +25,6 @@ public void Initialize(IModuleInfo moduleInfo)
             if (module != null)
             {
                 module.RegisterTypes(_container);
-                module.GetType().AutoRegisterViews(_container);
                 module.OnInitialized(_container);
             }
         }