Merge pull request #1509 from PrismLibrary/module-updates

Abstract ModuleInfo to IModuleInfo
PrismLibrary · Jul 19, 2018 · bd49627 · bd49627
2 parents b6d7e4b + c99a18b
commit bd49627
Show file tree

Hide file tree

Showing 35 changed files with 273 additions and 139 deletions.
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -40,6 +40,7 @@
     <PackageTags Condition=" '$(IsFormsProject)' == 'True' ">prism;mvvm;uwp;android;ios;xamarin;xamarin.forms;dependency injection;di</PackageTags>
     <IS_PREVIEW Condition=" '$(IS_PREVIEW)' == '' ">false</IS_PREVIEW>
     <IS_RELEASE Condition=" '$(IS_RELEASE)' == '' ">false</IS_RELEASE>
+    <ExtrasEnableWpfProjectSetup>$(IsWpfProject)</ExtrasEnableWpfProjectSetup>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/Source/Prism.Tests/Prism.Tests.csproj b/Source/Prism.Tests/Prism.Tests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Prism/Modularity/IModuleInfo.cs b/Source/Prism/Modularity/IModuleInfo.cs
@@ -0,0 +1,14 @@
+using System.Collections.ObjectModel;
+
+namespace Prism.Modularity
+{
+    public interface IModuleInfo : IModuleCatalogItem
+    {
+        Collection<string> DependsOn { get; set; }
+        InitializationMode InitializationMode { get; set; }
+        string ModuleName { get; set; }
+        string ModuleType { get; set; }
+        string Ref { get; set; }
+        ModuleState State { get; set; }
+    }
+}
diff --git a/Source/Prism/Modularity/IModuleInitializer.cs b/Source/Prism/Modularity/IModuleInitializer.cs
@@ -11,6 +11,6 @@ public interface IModuleInitializer
         /// Initializes the specified module.
         /// </summary>
         /// <param name="moduleInfo">The module to initialize</param>
-        void Initialize(ModuleInfo moduleInfo);
+        void Initialize(IModuleInfo moduleInfo);
     }
 }
diff --git a/Source/Prism/Modularity/LoadModuleCompletedEventArgs.cs b/Source/Prism/Modularity/LoadModuleCompletedEventArgs.cs
@@ -14,7 +14,7 @@ public class LoadModuleCompletedEventArgs : EventArgs
         /// </summary>
         /// <param name="moduleInfo">The module info.</param>
         /// <param name="error">Any error that occurred during the call.</param>
-        public LoadModuleCompletedEventArgs(ModuleInfo moduleInfo, Exception error)
+        public LoadModuleCompletedEventArgs(IModuleInfo moduleInfo, Exception error)
         {
             if (moduleInfo == null)
             {
@@ -29,7 +29,7 @@ public LoadModuleCompletedEventArgs(ModuleInfo moduleInfo, Exception error)
         /// Gets the module info.
         /// </summary>
         /// <value>The module info.</value>
-        public ModuleInfo ModuleInfo { get; private set; }
+        public IModuleInfo ModuleInfo { get; private set; }
 
         /// <summary>
         /// Gets any error that occurred

diff --git a/...rity/ModuleDependencyAttribute.Desktop.cs → ...m/Modularity/ModuleDependencyAttribute.cs b/...rity/ModuleDependencyAttribute.Desktop.cs → ...m/Modularity/ModuleDependencyAttribute.cs
@@ -1,5 +1,3 @@
-
-
 using System;
 
 namespace Prism.Modularity
@@ -10,24 +8,20 @@ namespace Prism.Modularity
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public sealed class ModuleDependencyAttribute : Attribute
     {
-        private readonly string _moduleName;
 
         /// <summary>
         /// Initializes a new instance of <see cref="ModuleDependencyAttribute"/>.
         /// </summary>
         /// <param name="moduleName">The name of the module that this module is dependant upon.</param>
         public ModuleDependencyAttribute(string moduleName)
         {
-            _moduleName = moduleName;
+            ModuleName = moduleName;
         }
 
         /// <summary>
         /// Gets the name of the module that this module is dependant upon.
         /// </summary>
         /// <value>The name of the module that this module is dependant upon.</value>
-        public string ModuleName
-        {
-            get { return _moduleName; }
-        }
+        public string ModuleName { get; }
     }
 }
diff --git a/Source/Prism/Modularity/ModuleDownloadProgressChangedEventArgs.cs b/Source/Prism/Modularity/ModuleDownloadProgressChangedEventArgs.cs
@@ -16,7 +16,7 @@ public class ModuleDownloadProgressChangedEventArgs : ProgressChangedEventArgs
         /// <param name="moduleInfo">The module info.</param>
         /// <param name="bytesReceived">The bytes received.</param>
         /// <param name="totalBytesToReceive">The total bytes to receive.</param>
-        public ModuleDownloadProgressChangedEventArgs(ModuleInfo moduleInfo, long bytesReceived, long totalBytesToReceive)
+        public ModuleDownloadProgressChangedEventArgs(IModuleInfo moduleInfo, long bytesReceived, long totalBytesToReceive)
             : base(CalculateProgressPercentage(bytesReceived, totalBytesToReceive), null)
         {
             if (moduleInfo == null)
@@ -31,7 +31,7 @@ public ModuleDownloadProgressChangedEventArgs(ModuleInfo moduleInfo, long bytesR
         /// Getsthe module info.
         /// </summary>
         /// <value>The module info.</value>
-        public ModuleInfo ModuleInfo { get; private set; }
+        public IModuleInfo ModuleInfo { get; private set; }
 
         /// <summary>
         /// Gets the bytes received.