diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index 18870d4980..cf3c8c2df4 100644
--- 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
index 24768bfc46..7bd2f7dd77 100644
--- 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
new file mode 100644
index 0000000000..9ade53fe96
--- /dev/null
+++ 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; }
+    }
+}
\ No newline at end of file
diff --git a/Source/Prism/Modularity/IModuleInitializer.cs b/Source/Prism/Modularity/IModuleInitializer.cs
index bde5bd4009..59582181ab 100644
--- 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
index 2cbc2cc074..eb9dcc5843 100644
--- 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/Source/Wpf/Prism.Wpf/Modularity/ModuleDependencyAttribute.Desktop.cs b/Source/Prism/Modularity/ModuleDependencyAttribute.cs
similarity index 83%
rename from Source/Wpf/Prism.Wpf/Modularity/ModuleDependencyAttribute.Desktop.cs
rename to Source/Prism/Modularity/ModuleDependencyAttribute.cs
index eea33d712e..f9bd373a4a 100644
--- a/Source/Wpf/Prism.Wpf/Modularity/ModuleDependencyAttribute.Desktop.cs
+++ b/Source/Prism/Modularity/ModuleDependencyAttribute.cs
@@ -1,5 +1,3 @@
-
-
 using System;
 
 namespace Prism.Modularity
@@ -10,7 +8,6 @@ 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"/>.
@@ -18,16 +15,13 @@ public sealed class ModuleDependencyAttribute : Attribute
         /// <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
index 846af9ae3c..395182c15c 100644
--- 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.
diff --git a/Source/PrismLibrary.sln b/Source/PrismLibrary.sln
index 1e5e6ca0c5..dfc08daaa7 100644
--- a/Source/PrismLibrary.sln
+++ b/Source/PrismLibrary.sln
@@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wpf", "Wpf", "{6BED0A37-BE6
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin", "Xamarin", "{77BDC65B-6FFD-447F-82A5-BA026A7719AE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Wpf", "Wpf\Prism.Wpf\Prism.Wpf.csproj", "{5912FF03-C72B-4F56-BAA1-8642FDBFBC26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Wpf", "Wpf\Prism.Wpf\Prism.Wpf.csproj", "{5912FF03-C72B-4F56-BAA1-8642FDBFBC26}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Wpf", "Wpf\Prism.Unity.Wpf\Prism.Unity.Wpf.csproj", "{C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Wpf", "Wpf\Prism.Unity.Wpf\Prism.Unity.Wpf.csproj", "{C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Forms", "Xamarin\Prism.Forms\Prism.Forms.csproj", "{F2E2CF03-8566-4035-BC23-0F623D52AB16}"
 EndProject
@@ -19,21 +19,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Forms", "Xamari
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Tests", "Prism.Tests\Prism.Tests.csproj", "{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Wpf.Tests", "Wpf\Prism.Unity.Wpf.Tests\Prism.Unity.Wpf.Tests.csproj", "{75511F4B-2602-4623-945C-AF8156B51F4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Wpf.Tests", "Wpf\Prism.Unity.Wpf.Tests\Prism.Unity.Wpf.Tests.csproj", "{75511F4B-2602-4623-945C-AF8156B51F4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Wpf.Tests", "Wpf\Prism.Wpf.Tests\Prism.Wpf.Tests.csproj", "{7DB8E74D-214F-4840-B294-58372D369958}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Wpf.Tests", "Wpf\Prism.Wpf.Tests\Prism.Wpf.Tests.csproj", "{7DB8E74D-214F-4840-B294-58372D369958}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Wpf", "Wpf\Prism.Autofac.Wpf\Prism.Autofac.Wpf.csproj", "{A47FA62E-8C9A-4C9F-9F65-A58B9AD7E8E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Autofac.Wpf", "Wpf\Prism.Autofac.Wpf\Prism.Autofac.Wpf.csproj", "{A47FA62E-8C9A-4C9F-9F65-A58B9AD7E8E0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Wpf.Tests", "Wpf\Prism.Autofac.Wpf.Tests\Prism.Autofac.Wpf.Tests.csproj", "{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Autofac.Wpf.Tests", "Wpf\Prism.Autofac.Wpf.Tests\Prism.Autofac.Wpf.Tests.csproj", "{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Ninject.Wpf", "Wpf\Prism.Ninject.Wpf\Prism.Ninject.Wpf.csproj", "{A4E80E69-EED3-440A-A50C-F64BBFC0103C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Ninject.Wpf", "Wpf\Prism.Ninject.Wpf\Prism.Ninject.Wpf.csproj", "{A4E80E69-EED3-440A-A50C-F64BBFC0103C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.IocContainer.Wpf.Tests.Support", "Wpf\Prism.IocContainer.Wpf.Tests.Support\Prism.IocContainer.Wpf.Tests.Support.csproj", "{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.IocContainer.Wpf.Tests.Support", "Wpf\Prism.IocContainer.Wpf.Tests.Support\Prism.IocContainer.Wpf.Tests.Support.csproj", "{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.StructureMap.Wpf", "Wpf\Prism.StructureMap.Wpf\Prism.StructureMap.Wpf.csproj", "{70268CD7-BCA4-4B6E-9EDC-BBC5950E0AB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.StructureMap.Wpf", "Wpf\Prism.StructureMap.Wpf\Prism.StructureMap.Wpf.csproj", "{70268CD7-BCA4-4B6E-9EDC-BBC5950E0AB9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.StructureMap.Wpf.Tests", "Wpf\Prism.StructureMap.Wpf.Tests\Prism.StructureMap.Wpf.Tests.csproj", "{2823CA8B-DCBD-4694-B842-8A327DFCAA02}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.StructureMap.Wpf.Tests", "Wpf\Prism.StructureMap.Wpf.Tests\Prism.StructureMap.Wpf.Tests.csproj", "{2823CA8B-DCBD-4694-B842-8A327DFCAA02}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{AD25EEBB-B23F-4238-BF4B-0E3199142E7F}"
 EndProject
@@ -47,11 +47,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Forms", "Xamar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Autofac.Forms", "Xamarin\Prism.Autofac.Forms\Prism.Autofac.Forms.csproj", "{C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Wpf.Tests", "Wpf\Prism.DryIoc.Wpf.Tests\Prism.DryIoc.Wpf.Tests.csproj", "{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Wpf.Tests", "Wpf\Prism.DryIoc.Wpf.Tests\Prism.DryIoc.Wpf.Tests.csproj", "{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Wpf", "Wpf\Prism.DryIoc.Wpf\Prism.DryIoc.Wpf.csproj", "{8ACF42B5-7765-44D0-BA22-D320F7ABC911}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Windows.Tests", "Windows10\Prism.Windows.Tests\Prism.Windows.Tests.csproj", "{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Wpf", "Wpf\Prism.DryIoc.Wpf\Prism.DryIoc.Wpf.csproj", "{8ACF42B5-7765-44D0-BA22-D320F7ABC911}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Windows", "Windows10\Prism.Windows\Prism.Windows.csproj", "{3B7C3599-A336-4DB2-8678-710E3B36203B}"
 EndProject
@@ -69,7 +67,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Forms.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Forms.Tests", "Xamarin\Prism.Unity.Forms.Tests\Prism.Unity.Forms.Tests.csproj", "{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Ninject.Wpf.Tests", "Wpf\Prism.Ninject.Wpf.Tests\Prism.Ninject.Wpf.Tests.csproj", "{E20AAE94-4851-4BAB-A0D3-66FBBFFD6531}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Ninject.Wpf.Tests", "Wpf\Prism.Ninject.Wpf.Tests\Prism.Ninject.Wpf.Tests.csproj", "{E20AAE94-4851-4BAB-A0D3-66FBBFFD6531}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -134,6 +132,7 @@ Global
 		{EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|x86.ActiveCfg = Release|Any CPU
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -143,6 +142,7 @@ Global
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|x64.ActiveCfg = Release|Any CPU
 		{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|x86.ActiveCfg = Release|Any CPU
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -152,6 +152,7 @@ Global
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Release|x64.ActiveCfg = Release|Any CPU
 		{75511F4B-2602-4623-945C-AF8156B51F4E}.Release|x86.ActiveCfg = Release|Any CPU
 		{7DB8E74D-214F-4840-B294-58372D369958}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DB8E74D-214F-4840-B294-58372D369958}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DB8E74D-214F-4840-B294-58372D369958}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{7DB8E74D-214F-4840-B294-58372D369958}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7DB8E74D-214F-4840-B294-58372D369958}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -171,6 +172,7 @@ Global
 		{A47FA62E-8C9A-4C9F-9F65-A58B9AD7E8E0}.Release|x64.ActiveCfg = Release|Any CPU
 		{A47FA62E-8C9A-4C9F-9F65-A58B9AD7E8E0}.Release|x86.ActiveCfg = Release|Any CPU
 		{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2F5019EA-2692-4B43-B73A-A65BEA2EB2F7}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -190,6 +192,7 @@ Global
 		{A4E80E69-EED3-440A-A50C-F64BBFC0103C}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4E80E69-EED3-440A-A50C-F64BBFC0103C}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FF6F1B2C-BECC-4477-B918-B75615BAA3A5}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -215,6 +218,7 @@ Global
 		{70268CD7-BCA4-4B6E-9EDC-BBC5950E0AB9}.Release|x86.ActiveCfg = Release|Any CPU
 		{70268CD7-BCA4-4B6E-9EDC-BBC5950E0AB9}.Release|x86.Build.0 = Release|Any CPU
 		{2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Debug|ARM.Build.0 = Debug|Any CPU
 		{2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -262,6 +266,7 @@ Global
 		{C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x86.ActiveCfg = Release|Any CPU
 		{C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x86.Build.0 = Release|Any CPU
 		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|ARM.Build.0 = Debug|Any CPU
 		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -292,28 +297,6 @@ Global
 		{8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Release|x64.Build.0 = Release|Any CPU
 		{8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Release|x86.ActiveCfg = Release|Any CPU
 		{8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Release|x86.Build.0 = Release|Any CPU
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.Build.0 = Debug|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.Deploy.0 = Debug|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.ActiveCfg = Debug|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.Build.0 = Debug|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.Deploy.0 = Debug|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.ActiveCfg = Debug|x86
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.Build.0 = Debug|x86
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.Deploy.0 = Debug|x86
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.ActiveCfg = Release|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.Build.0 = Release|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.Deploy.0 = Release|ARM
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.ActiveCfg = Release|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.Build.0 = Release|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.Deploy.0 = Release|x64
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.ActiveCfg = Release|x86
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.Build.0 = Release|x86
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.Deploy.0 = Release|x86
 		{3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -379,6 +362,7 @@ Global
 		{CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x86.ActiveCfg = Release|Any CPU
 		{CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x86.Build.0 = Release|Any CPU
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Debug|ARM.Build.0 = Debug|Any CPU
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -394,6 +378,7 @@ Global
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8C1CC40-9850-49D5-92F1-2126DDC1EC8B}.Release|x86.Build.0 = Release|Any CPU
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Debug|ARM.Build.0 = Debug|Any CPU
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -409,6 +394,7 @@ Global
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Release|x86.ActiveCfg = Release|Any CPU
 		{D9D5B704-E3B3-4B14-A597-CE6F2922AFF1}.Release|x86.Build.0 = Release|Any CPU
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Debug|ARM.Build.0 = Debug|Any CPU
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -424,6 +410,7 @@ Global
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Release|x86.ActiveCfg = Release|Any CPU
 		{5DB3F17B-EF88-431D-A8FE-3DED63F0EB7F}.Release|x86.Build.0 = Release|Any CPU
 		{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}.Debug|ARM.Build.0 = Debug|Any CPU
 		{CCE50109-7ED2-4D7D-948F-6CB36AD767DB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -478,7 +465,6 @@ Global
 		{C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE}
 		{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D} = {AD25EEBB-B23F-4238-BF4B-0E3199142E7F}
 		{8ACF42B5-7765-44D0-BA22-D320F7ABC911} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB}
-		{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27} = {BD870EC2-18B3-4537-A74A-63784B915EB8}
 		{3B7C3599-A336-4DB2-8678-710E3B36203B} = {785CEF4D-2A96-4B25-91A9-3C18EF055223}
 		{B4060AD6-7A34-479C-B5EB-4C542A681F42} = {785CEF4D-2A96-4B25-91A9-3C18EF055223}
 		{E6F934A2-3962-46F2-A4B8-416394C351B8} = {785CEF4D-2A96-4B25-91A9-3C18EF055223}
diff --git a/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj b/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj
index fc37644fd2..7eca7ce24e 100644
--- a/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj b/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
index fbb88473c7..653e6586b6 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
-    <PackageReference Include="DryIoc.dll" Version="2.12.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
+    <PackageReference Include="DryIoc.dll" Version="3.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
index c811f7e881..2fc54d5594 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
+++ b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="2.12.10" />
+    <PackageReference Include="DryIoc.dll" Version="3.0.2" />
     <!-- <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/Source/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockModuleLoader.cs b/Source/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockModuleLoader.cs
index 5ba79f1489..ea309d688f 100644
--- a/Source/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockModuleLoader.cs
+++ b/Source/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockModuleLoader.cs
@@ -8,7 +8,7 @@ public class MockModuleInitializer : IModuleInitializer
     {
         public bool LoadCalled;
 
-        public void Initialize(ModuleInfo moduleInfo)
+        public void Initialize(IModuleInfo moduleInfo)
         {
             LoadCalled = true;
         }
diff --git a/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj b/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj
index 228b4a8058..d819e309f9 100644
--- a/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Wpf/Prism.StructureMap.Wpf.Tests/Prism.StructureMap.Wpf.Tests.csproj b/Source/Wpf/Prism.StructureMap.Wpf.Tests/Prism.StructureMap.Wpf.Tests.csproj
index 609fc9f14f..7df3d0e391 100644
--- a/Source/Wpf/Prism.StructureMap.Wpf.Tests/Prism.StructureMap.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.StructureMap.Wpf.Tests/Prism.StructureMap.Wpf.Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Wpf/Prism.StructureMap.Wpf/Prism.StructureMap.Wpf.csproj b/Source/Wpf/Prism.StructureMap.Wpf/Prism.StructureMap.Wpf.csproj
index 7bb9f516c2..076a39a503 100644
--- a/Source/Wpf/Prism.StructureMap.Wpf/Prism.StructureMap.Wpf.csproj
+++ b/Source/Wpf/Prism.StructureMap.Wpf/Prism.StructureMap.Wpf.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StructureMap" Version="4.6.1" />
+    <PackageReference Include="StructureMap" Version="4.7.0" />
     
     <!-- <Reference Include="PresentationFramework" />
     <Reference Include="System" />
diff --git a/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj b/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
index 15e70fe4fa..6df9551aba 100644
--- a/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="Moq" Version="4.8.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Moq" Version="4.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleCatalogXaml/SimpleModuleCatalog.xaml b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleCatalogXaml/SimpleModuleCatalog.xaml
index 3c9bb75ca4..920802038a 100644
--- a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleCatalogXaml/SimpleModuleCatalog.xaml
+++ b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleCatalogXaml/SimpleModuleCatalog.xaml
@@ -1,20 +1,19 @@
 <Modularity:ModuleCatalog xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                          xmlns:coreModularity="clr-namespace:Prism.Modularity;assembly=Prism"
                           xmlns:Modularity="clr-namespace:Prism.Modularity;assembly=Prism.Wpf">
     <Modularity:ModuleInfoGroup Ref="ModuleGroup1" InitializationMode="OnDemand">
-        <coreModularity:ModuleInfo ModuleName="Module1" ModuleType="Module1Type" />
+        <Modularity:ModuleInfo ModuleName="Module1" ModuleType="Module1Type" />
     </Modularity:ModuleInfoGroup>
     <Modularity:ModuleInfoGroup Ref="ModuleGroup2" InitializationMode="WhenAvailable">
-        <coreModularity:ModuleInfo ModuleName="Module2InModuleGroup2" ModuleType="Module2Type">
-            <coreModularity:ModuleInfo.DependsOn>
+        <Modularity:ModuleInfo ModuleName="Module2InModuleGroup2" ModuleType="Module2Type">
+            <Modularity:ModuleInfo.DependsOn>
                 <sys:String>ModuleW</sys:String>
-            </coreModularity:ModuleInfo.DependsOn>
-        </coreModularity:ModuleInfo>
-        <coreModularity:ModuleInfo ModuleName="Module3InModuleGroup2" ModuleType="ModuleType">
-        </coreModularity:ModuleInfo>
+            </Modularity:ModuleInfo.DependsOn>
+        </Modularity:ModuleInfo>
+        <Modularity:ModuleInfo ModuleName="Module3InModuleGroup2" ModuleType="ModuleType">
+        </Modularity:ModuleInfo>
     </Modularity:ModuleInfoGroup>
-    <coreModularity:ModuleInfo Ref="Module3" ModuleName="Module3" ModuleType="Module3Type" />
+    <Modularity:ModuleInfo Ref="Module3" ModuleName="Module3" ModuleType="Module3Type" />
 </Modularity:ModuleCatalog>
 
diff --git a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleInitializerFixture.cs b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleInitializerFixture.cs
index 74e396e56f..a7e03235d3 100644
--- a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleInitializerFixture.cs
+++ b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleInitializerFixture.cs
@@ -215,7 +215,7 @@ public CustomModuleInitializerService(IContainerExtension containerFacade, ILogg
             {
             }
 
-            public override void HandleModuleInitializationError(ModuleInfo moduleInfo, string assemblyName, Exception exception)
+            public override void HandleModuleInitializationError(IModuleInfo moduleInfo, string assemblyName, Exception exception)
             {
                 HandleModuleInitializerrorCalled = true;
             }
diff --git a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleManagerFixture.cs b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleManagerFixture.cs
index 6d568fe91f..6678273469 100644
--- a/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleManagerFixture.cs
+++ b/Source/Wpf/Prism.Wpf.Tests/Modularity/ModuleManagerFixture.cs
@@ -501,9 +501,9 @@ public void AddModule(ModuleInfo moduleInfo)
     internal class MockModuleInitializer : IModuleInitializer
     {
         public bool InitializeCalled;
-        public List<ModuleInfo> InitializedModules = new List<ModuleInfo>();
+        public List<IModuleInfo> InitializedModules = new List<IModuleInfo>();
 
-        public void Initialize(ModuleInfo moduleInfo)
+        public void Initialize(IModuleInfo moduleInfo)
         {
             InitializeCalled = true;            
             this.InitializedModules.Add(moduleInfo);
@@ -514,9 +514,9 @@ internal class StubModuleInitializer : IModuleInitializer
     {
         public Action<ModuleInfo> Initialize;
 
-        void IModuleInitializer.Initialize(ModuleInfo moduleInfo)
+        void IModuleInitializer.Initialize(IModuleInfo moduleInfo)
         {
-            this.Initialize(moduleInfo);
+            this.Initialize((ModuleInfo)moduleInfo);
         }
     }
 
@@ -524,9 +524,9 @@ internal class MockDelegateModuleInitializer : IModuleInitializer
     {
         public Action<ModuleInfo> LoadBody;
 
-        public void Initialize(ModuleInfo moduleInfo)
+        public void Initialize(IModuleInfo moduleInfo)
         {
-            LoadBody(moduleInfo);
+            LoadBody((ModuleInfo)moduleInfo);
         }
     }
 }
diff --git a/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj b/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
index 4864e446af..6a1980f85b 100644
--- a/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
+++ b/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
@@ -33,7 +33,7 @@
       <HintPath>..\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="Moq" Version="4.8.3" />
+    <PackageReference Include="Moq" Version="4.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
   </ItemGroup>
diff --git a/Source/Wpf/Prism.Wpf/Modularity/FileModuleTypeLoader.Desktop.cs b/Source/Wpf/Prism.Wpf/Modularity/FileModuleTypeLoader.Desktop.cs
index 22bce14682..6fdf1e707e 100644
--- a/Source/Wpf/Prism.Wpf/Modularity/FileModuleTypeLoader.Desktop.cs
+++ b/Source/Wpf/Prism.Wpf/Modularity/FileModuleTypeLoader.Desktop.cs
@@ -41,17 +41,14 @@ public FileModuleTypeLoader(IAssemblyResolver assemblyResolver)
         /// </summary>
         public event EventHandler<ModuleDownloadProgressChangedEventArgs> ModuleDownloadProgressChanged;
 
-        private void RaiseModuleDownloadProgressChanged(ModuleInfo moduleInfo, long bytesReceived, long totalBytesToReceive)
+        private void RaiseModuleDownloadProgressChanged(IModuleInfo moduleInfo, long bytesReceived, long totalBytesToReceive)
         {
             this.RaiseModuleDownloadProgressChanged(new ModuleDownloadProgressChangedEventArgs(moduleInfo, bytesReceived, totalBytesToReceive));
         }
 
         private void RaiseModuleDownloadProgressChanged(ModuleDownloadProgressChangedEventArgs e)
         {
-            if (this.ModuleDownloadProgressChanged != null)
-            {
-                this.ModuleDownloadProgressChanged(this, e);
-            }
+            ModuleDownloadProgressChanged?.Invoke(this, e);
         }
 
         /// <summary>
@@ -59,17 +56,14 @@ private void RaiseModuleDownloadProgressChanged(ModuleDownloadProgressChangedEve
         /// </summary>
         public event EventHandler<LoadModuleCompletedEventArgs> LoadModuleCompleted;
 
-        private void RaiseLoadModuleCompleted(ModuleInfo moduleInfo, Exception error)
+        private void RaiseLoadModuleCompleted(IModuleInfo moduleInfo, Exception error)
         {
             this.RaiseLoadModuleCompleted(new LoadModuleCompletedEventArgs(moduleInfo, error));
         }
 
         private void RaiseLoadModuleCompleted(LoadModuleCompletedEventArgs e)
         {
-            if (this.LoadModuleCompleted != null)
-            {
-                this.LoadModuleCompleted(this, e);
-            }
+            this.LoadModuleCompleted?.Invoke(this, e);
         }
 
         /// <summary>
diff --git a/Source/Prism/Modularity/ModuleInfo.Desktop.cs b/Source/Wpf/Prism.Wpf/Modularity/ModuleInfo.Desktop.cs
similarity index 100%
rename from Source/Prism/Modularity/ModuleInfo.Desktop.cs
rename to Source/Wpf/Prism.Wpf/Modularity/ModuleInfo.Desktop.cs
diff --git a/Source/Prism/Modularity/ModuleInfo.cs b/Source/Wpf/Prism.Wpf/Modularity/ModuleInfo.cs
similarity index 98%
rename from Source/Prism/Modularity/ModuleInfo.cs
rename to Source/Wpf/Prism.Wpf/Modularity/ModuleInfo.cs
index 1dac1321be..62fb28c628 100644
--- a/Source/Prism/Modularity/ModuleInfo.cs
+++ b/Source/Wpf/Prism.Wpf/Modularity/ModuleInfo.cs
@@ -1,5 +1,3 @@
-
-
 using System;
 using System.Collections.ObjectModel;
 
@@ -8,7 +6,7 @@ namespace Prism.Modularity
     /// <summary>
     /// Defines the metadata that describes a module.
     /// </summary>
-    public partial class ModuleInfo : IModuleCatalogItem
+    public partial class ModuleInfo : IModuleInfo
     {
         /// <summary>
         /// Initializes a new empty instance of <see cref="ModuleInfo"/>.
diff --git a/Source/Wpf/Prism.Wpf/Modularity/ModuleInitializer.cs b/Source/Wpf/Prism.Wpf/Modularity/ModuleInitializer.cs
index d26548804a..81a312c821 100644
--- a/Source/Wpf/Prism.Wpf/Modularity/ModuleInitializer.cs
+++ b/Source/Wpf/Prism.Wpf/Modularity/ModuleInitializer.cs
@@ -20,14 +20,8 @@ public class ModuleInitializer : IModuleInitializer
         /// <param name="loggerFacade">The logger to use.</param>
         public ModuleInitializer(IContainerExtension containerExtension, ILoggerFacade loggerFacade)
         {
-            if (containerExtension == null)
-                throw new ArgumentNullException(nameof(containerExtension));
-
-            if (loggerFacade == null)
-                throw new ArgumentNullException(nameof(loggerFacade));
-
-            this._containerExtension = containerExtension;
-            this._loggerFacade = loggerFacade;
+            this._containerExtension = containerExtension ?? throw new ArgumentNullException(nameof(containerExtension));
+            this._loggerFacade = loggerFacade ?? throw new ArgumentNullException(nameof(loggerFacade));
         }
 
         /// <summary>
@@ -35,7 +29,7 @@ public ModuleInitializer(IContainerExtension containerExtension, ILoggerFacade l
         /// </summary>
         /// <param name="moduleInfo">The module to initialize</param>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Catches Exception to handle any exception thrown during the initialization process with the HandleModuleInitializationError method.")]
-        public void Initialize(ModuleInfo moduleInfo)
+        public void Initialize(IModuleInfo moduleInfo)
         {
             if (moduleInfo == null)
                 throw new ArgumentNullException(nameof(moduleInfo));
@@ -54,7 +48,7 @@ public void Initialize(ModuleInfo moduleInfo)
             {
                 this.HandleModuleInitializationError(
                     moduleInfo,
-                    moduleInstance != null ? moduleInstance.GetType().Assembly.FullName : null,
+                    moduleInstance?.GetType().Assembly.FullName,
                     ex);
             }
         }
@@ -68,7 +62,7 @@ public void Initialize(ModuleInfo moduleInfo)
         /// <param name="assemblyName">The assembly name.</param>
         /// <param name="exception">The exception thrown that is the cause of the current error.</param>
         /// <exception cref="ModuleInitializeException"></exception>
-        public virtual void HandleModuleInitializationError(ModuleInfo moduleInfo, string assemblyName, Exception exception)
+        public virtual void HandleModuleInitializationError(IModuleInfo moduleInfo, string assemblyName, Exception exception)
         {
             if (moduleInfo == null)
                 throw new ArgumentNullException(nameof(moduleInfo));
@@ -104,7 +98,7 @@ public virtual void HandleModuleInitializationError(ModuleInfo moduleInfo, strin
         /// </summary>
         /// <param name="moduleInfo">The module to create.</param>
         /// <returns>A new instance of the module specified by <paramref name="moduleInfo"/>.</returns>
-        protected virtual IModule CreateModule(ModuleInfo moduleInfo)
+        protected virtual IModule CreateModule(IModuleInfo moduleInfo)
         {
             if (moduleInfo == null)
                 throw new ArgumentNullException(nameof(moduleInfo));
diff --git a/Source/Wpf/Prism.Wpf/Modularity/ModuleManager.cs b/Source/Wpf/Prism.Wpf/Modularity/ModuleManager.cs
index 852eaf191f..2aa429c8b8 100644
--- a/Source/Wpf/Prism.Wpf/Modularity/ModuleManager.cs
+++ b/Source/Wpf/Prism.Wpf/Modularity/ModuleManager.cs
@@ -239,7 +239,7 @@ private void IModuleTypeLoader_LoadModuleCompleted(object sender, LoadModuleComp
                 // If the error is not handled then I log it and raise an exception.
                 if (!e.IsErrorHandled)
                 {
-                    this.HandleModuleTypeLoadingError(e.ModuleInfo, e.Error);
+                    this.HandleModuleTypeLoadingError((ModuleInfo)e.ModuleInfo, e.Error);
                 }
             }
         }
diff --git a/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj b/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj
index 188da4c4da..9d97becabe 100644
--- a/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj
+++ b/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.561732-pre4" />
-    <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="Xamarin.Forms" Version="3.1.0.637273" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj
index 80eebf1935..7c9332f5c0 100644
--- a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj
+++ b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.561732-pre4" />
-    <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="Xamarin.Forms" Version="3.1.0.637273" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
index c9deab00c6..1e623e1734 100644
--- a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
+++ b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="2.12.10" />
+    <PackageReference Include="DryIoc.dll" Version="3.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj b/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj
index adfccea21d..de1d1854a0 100644
--- a/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj
+++ b/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj
@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.561732-pre4" />
-    <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="Xamarin.Forms" Version="3.1.0.637273" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.Forms/Modularity/ModuleInfo.cs b/Source/Xamarin/Prism.Forms/Modularity/ModuleInfo.cs
new file mode 100644
index 0000000000..5c98026182
--- /dev/null
+++ b/Source/Xamarin/Prism.Forms/Modularity/ModuleInfo.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Reflection;
+
+namespace Prism.Modularity
+{
+    /// <summary>
+    /// Defines the metadata that describes a module.
+    /// </summary>
+    public partial class ModuleInfo : IModuleInfo
+    {
+        /// <summary>
+        /// Initializes a new empty instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        public ModuleInfo()
+            : this(null, null, new string[0])
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        /// <param name="name">The module's name.</param>
+        /// <param name="type">The module <see cref="Type"/>'s AssemblyQualifiedName.</param>
+        /// <param name="dependsOn">The modules this instance depends on.</param>
+        /// <exception cref="ArgumentNullException">An <see cref="ArgumentNullException"/> is thrown if <paramref name="dependsOn"/> is <see langword="null"/>.</exception>
+        public ModuleInfo(string name, string type, params string[] dependsOn)
+        {
+            if (Type.GetType(type) == null)
+                throw new ArgumentNullException(nameof(type));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name));
+            if (dependsOn == null)
+                throw new ArgumentNullException(nameof(dependsOn));
+
+            ModuleName = name;
+            ModuleType = type;
+            foreach (string dependency in dependsOn)
+            {
+                if (!DependsOn.Contains(dependency))
+                {
+                    DependsOn.Add(dependency);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        /// <param name="name">The module's name.</param>
+        /// <param name="type">The module's type.</param>
+        public ModuleInfo(string name, string type) : this(name, type, new string[0])
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        /// <param name="moduleType">The module's type.</param>
+        public ModuleInfo(Type moduleType)
+            : this(moduleType, moduleType.Name) { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        /// <param name="moduleType">The module's type.</param>
+        /// <param name="moduleName">The module's name.</param>
+        public ModuleInfo(Type moduleType, string moduleName)
+            : this(moduleType, moduleName, InitializationMode.WhenAvailable) { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModuleInfo"/>.
+        /// </summary>
+        /// <param name="moduleType">The module's type.</param>
+        /// <param name="moduleName">The module's name.</param>
+        /// <param name="initializationMode">The module's <see cref="InitializationMode"/>.</param>
+        public ModuleInfo(Type moduleType, string moduleName, InitializationMode initializationMode)
+            : this(moduleName, moduleType.AssemblyQualifiedName)
+        {
+            InitializationMode = initializationMode;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the module.
+        /// </summary>
+        /// <value>The name of the module.</value>
+        public string ModuleName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the module <see cref="Type"/>'s AssemblyQualifiedName.
+        /// </summary>
+        /// <value>The type of the module.</value>
+        public string ModuleType { get; set; }
+
+        private Collection<string> _dependsOn;
+        /// <summary>
+        /// Gets or sets the list of modules that this module depends upon.
+        /// </summary>
+        /// <value>The list of modules that this module depends upon.</value>
+        public Collection<string> DependsOn
+        {
+            get
+            {
+                if(_dependsOn == null)
+                {
+                    _dependsOn = new Collection<string>();
+                    var moduleType = Type.GetType(ModuleType);
+                    foreach(var dependencyAttribute in moduleType.GetTypeInfo().GetCustomAttributes<ModuleDependencyAttribute>())
+                    {
+                        _dependsOn.Add(dependencyAttribute.ModuleName);
+                    }
+                }
+
+                return _dependsOn;
+            }
+            set => _dependsOn = value;
+        }
+
+        /// <summary>
+        /// Specifies on which stage the Module will be initialized.
+        /// </summary>
+        public InitializationMode InitializationMode { get; set; }
+
+        /// <summary>
+        /// Reference to the location of the module assembly.
+        /// <example>The following are examples of valid <see cref="ModuleInfo.Ref"/> values:
+        /// file://c:/MyProject/Modules/MyModule.dll for a loose DLL in WPF.
+        /// </example>
+        /// </summary>
+        public string Ref { get; set; }
+
+        /// <summary>
+        /// Gets or sets the state of the <see cref="ModuleInfo"/> with regards to the module loading and initialization process.
+        /// </summary>
+        public ModuleState State { get; set; }
+    }
+}
diff --git a/Source/Xamarin/Prism.Forms/Modularity/ModuleInitializer.cs b/Source/Xamarin/Prism.Forms/Modularity/ModuleInitializer.cs
index bfba8e6daa..5c9589c246 100644
--- a/Source/Xamarin/Prism.Forms/Modularity/ModuleInitializer.cs
+++ b/Source/Xamarin/Prism.Forms/Modularity/ModuleInitializer.cs
@@ -12,7 +12,7 @@ public ModuleInitializer(IContainerExtension container)
             _container = container;
         }
 
-        public void Initialize(ModuleInfo moduleInfo)
+        public void Initialize(IModuleInfo moduleInfo)
         {
             var module = CreateModule(Type.GetType(moduleInfo.ModuleType, true));
             if (module != null)
diff --git a/Source/Xamarin/Prism.Forms/Modularity/ModuleManager.cs b/Source/Xamarin/Prism.Forms/Modularity/ModuleManager.cs
index 3564d6a330..92c086d461 100644
--- a/Source/Xamarin/Prism.Forms/Modularity/ModuleManager.cs
+++ b/Source/Xamarin/Prism.Forms/Modularity/ModuleManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Prism.Modularity
 {
@@ -51,10 +52,10 @@ public void LoadModule(string moduleName)
         {
             var modules = ModuleCatalog.Modules.Where(m => m.ModuleName == moduleName);
             if (modules == null || modules.Count() == 0)
-                throw new Exception($"Module {moduleName} was not found in the catalog.");
+                throw new ModuleNotFoundException($"Module {moduleName} was not found in the catalog.");
 
             if (modules.Count() != 1)
-                throw new Exception($"A duplicated module with name {moduleName} has been found in the catalog.");
+                throw new DuplicateModuleException($"A duplicated module with name {moduleName} has been found in the catalog.");
 
             LoadModules(modules);
         }
@@ -82,6 +83,7 @@ protected virtual void LoadModules(IEnumerable<ModuleInfo> moduleInfos)
                     try
                     {
                         moduleInfo.State = ModuleState.Initializing;
+                        LoadDependentModules(moduleInfo);
                         ModuleInitializer.Initialize(moduleInfo);
                         moduleInfo.State = ModuleState.Initialized;
                         LoadModuleCompleted?.Invoke(this, new LoadModuleCompletedEventArgs(moduleInfo, null));
@@ -94,5 +96,20 @@ protected virtual void LoadModules(IEnumerable<ModuleInfo> moduleInfos)
                 }
             }
         }
+
+        private void LoadDependentModules(IModuleInfo moduleInfo)
+        {
+            if (!moduleInfo.DependsOn.Any()) return;
+
+            var dependencies = ModuleCatalog.Modules.Where(m => moduleInfo.DependsOn.Contains(m.ModuleName));
+
+            if (moduleInfo.InitializationMode == InitializationMode.WhenAvailable && dependencies.Any(m => m.InitializationMode != InitializationMode.WhenAvailable))
+                throw new ModuleInitializeException(moduleInfo.ModuleName, Type.GetType(moduleInfo.ModuleType).GetTypeInfo().Assembly.FullName, $"Error loading '{moduleInfo.ModuleName}'. A startup module cannot have dependencies with an InitializationMode of OnDemand");
+
+            if (dependencies.Count() != moduleInfo.DependsOn.Count)
+                throw new ModuleInitializeException(moduleInfo.ModuleName, Type.GetType(moduleInfo.ModuleType).GetTypeInfo().Assembly.FullName, $"Error loading '{moduleInfo.ModuleName}'. One or more module dependencies could not be located.");
+
+            LoadModules(dependencies);
+        }
     }
 }
diff --git a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj
index ee9c6d6d3c..980664374c 100644
--- a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj
+++ b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.561732-pre4" />
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.637273" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj b/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj
index eadecca4d9..cebdbb2485 100644
--- a/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj
+++ b/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.561732-pre4" />
-    <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="Xamarin.Forms" Version="3.1.0.637273" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/global.json b/Source/global.json
index fb599210d5..c5eb039a68 100644
--- a/Source/global.json
+++ b/Source/global.json
@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "1.5.4"
+        "MSBuild.Sdk.Extras": "1.6.41"
     }
 }
\ No newline at end of file