Merge pull request #1062 from dansiegel/task/container-updates

Container Updates

13 files changed, 22 insertions, 23 deletions

diff --git a/Source/Windows10/Prism.Autofac.Windows/project.json b/Source/Windows10/Prism.Autofac.Windows/project.json
index 977a09c..34084e5 100644
--- a/Source/Windows10/Prism.Autofac.Windows/project.json
+++ b/Source/Windows10/Prism.Autofac.Windows/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Autofac": "3.5.2",
+    "Autofac": "4.6.0",
     "CommonServiceLocator": "1.3.0",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
   },
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 485c0e6..d8ffc45 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
@@ -35,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
diff --git a/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config b/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config
index 1d2a979..c577d6c 100644
--- a/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config
+++ b/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="3.5.2" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="Moq" version="4.7.0" targetFramework="net45" />
diff --git a/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj b/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj
index 9099f12..4d920ac 100644
--- a/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj
+++ b/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj
@@ -37,8 +37,8 @@
     <AssemblyOriginatorKeyFile>..\..\prism.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
diff --git a/Source/Wpf/Prism.Autofac.Wpf/packages.config b/Source/Wpf/Prism.Autofac.Wpf/packages.config
index 40fcac4..1620ae1 100644
--- a/Source/Wpf/Prism.Autofac.Wpf/packages.config
+++ b/Source/Wpf/Prism.Autofac.Wpf/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="3.5.2" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
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 f1f0dbb..f6200ad 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
@@ -35,9 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DryIoc, Version=2.8.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DryIoc.dll.2.8.3\lib\net45\DryIoc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="DryIoc, Version=2.10.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\DryIoc.dll.2.10.7\lib\net45\DryIoc.dll</HintPath>
     </Reference>
     <Reference Include="DryIoc.CommonServiceLocator, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\DryIoc.CommonServiceLocator.dll.2.2.1\lib\net40-Client\DryIoc.CommonServiceLocator.dll</HintPath>
diff --git a/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config b/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config
index 448d4fe..db33bce 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config
+++ b/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="DryIoc.CommonServiceLocator.dll" version="2.2.1" targetFramework="net45" />
-  <package id="DryIoc.dll" version="2.8.3" targetFramework="net45" />
+  <package id="DryIoc.dll" version="2.10.7" targetFramework="net45" />
   <package id="System.Collections" version="4.0.11" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
   <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net45" />
diff --git a/Source/Wpf/Prism.DryIoc.Wpf/DryIocBootstrapper.cs b/Source/Wpf/Prism.DryIoc.Wpf/DryIocBootstrapper.cs
index 3bff15f..8230f24 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf/DryIocBootstrapper.cs
+++ b/Source/Wpf/Prism.DryIoc.Wpf/DryIocBootstrapper.cs
@@ -115,7 +115,7 @@ namespace Prism.DryIoc
             ServiceLocator.SetLocatorProvider(() => serviceLocator);
 
             // register the locator in DryIoc as well
-            Container.RegisterInstance<IServiceLocator>(serviceLocator);
+            Container.UseInstance<IServiceLocator>(serviceLocator);
         }
 
         /// <summary>
@@ -143,8 +143,8 @@ namespace Prism.DryIoc
         /// </summary>
         protected virtual void ConfigureContainer()
         {
-            Container.RegisterInstance<ILoggerFacade>(Logger);
-            Container.RegisterInstance<IModuleCatalog>(ModuleCatalog);
+            Container.UseInstance<ILoggerFacade>(Logger);
+            Container.UseInstance<IModuleCatalog>(ModuleCatalog);
 
             if (_useDefaultConfiguration)
             {
diff --git a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
index efe788b..25ce697 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
+++ b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
@@ -36,8 +36,8 @@
     <AssemblyOriginatorKeyFile>..\..\prism.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DryIoc, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DryIoc.dll.2.10.1\lib\net45\DryIoc.dll</HintPath>
+    <Reference Include="DryIoc, Version=2.10.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\DryIoc.dll.2.10.7\lib\net45\DryIoc.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DryIoc.CommonServiceLocator, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Source/Wpf/Prism.DryIoc.Wpf/packages.config b/Source/Wpf/Prism.DryIoc.Wpf/packages.config
index 384eb1b..0b1917c 100644
--- a/Source/Wpf/Prism.DryIoc.Wpf/packages.config
+++ b/Source/Wpf/Prism.DryIoc.Wpf/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="DryIoc.CommonServiceLocator.dll" version="2.2.1" targetFramework="net45" />
-  <package id="DryIoc.dll" version="2.10.1" targetFramework="net45" />
+  <package id="DryIoc.dll" version="2.10.7" targetFramework="net45" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
diff --git a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj
index 310de87..1ce8862 100644
--- a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj
+++ b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.1;</TargetFrameworks>
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.5.0" />
+    <PackageReference Include="Autofac" Version="4.6.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 c9dff07..98e4bca 100644
--- a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
+++ b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="2.10.6" />
+    <PackageReference Include="DryIoc.dll" Version="2.10.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Xamarin/Prism.DryIoc.Forms/PrismApplication.cs b/Source/Xamarin/Prism.DryIoc.Forms/PrismApplication.cs
index 556765d..39b6956 100644
--- a/Source/Xamarin/Prism.DryIoc.Forms/PrismApplication.cs
+++ b/Source/Xamarin/Prism.DryIoc.Forms/PrismApplication.cs
@@ -72,9 +72,9 @@ namespace Prism.DryIoc
 
         protected override void ConfigureContainer()
         {
-            Container.RegisterInstance(Logger);
-            Container.RegisterInstance(ModuleCatalog);
-            Container.RegisterInstance(Container);
+            Container.UseInstance(Logger);
+            Container.UseInstance(ModuleCatalog);
+            Container.UseInstance(Container);
             Container.Register<INavigationService, DryIocPageNavigationService>(serviceKey: _navigationServiceKey);
             Container.Register<IApplicationProvider, ApplicationProvider>(Reuse.Singleton);
             Container.Register<IApplicationStore, ApplicationStore>(Reuse.Singleton);