diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 9ac8a9e81..feb8b0155 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -114,10 +114,6 @@
..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
True
-
- ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll
- True
-
@@ -176,6 +172,9 @@
..\..\packages\Xam.Plugin.PushNotification.1.2.4\lib\MonoAndroid10\PushNotification.Plugin.Abstractions.dll
True
+
+ ..\..\packages\SimpleInjector.4.0.7\lib\netstandard1.3\SimpleInjector.dll
+
..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll
True
@@ -218,6 +217,7 @@
+
..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll
@@ -291,9 +291,8 @@
..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll
True
-
- ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll
- True
+
+ ..\..\packages\XLabs.IoC.SimpleInjector.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.SimpleInjector.dll
diff --git a/src/Android/MainApplication.cs b/src/Android/MainApplication.cs
index 0f5c96c82..4f308ef5e 100644
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -8,7 +8,6 @@ using Bit.Android.Services;
using Bit.App.Abstractions;
using Bit.App.Repositories;
using Bit.App.Services;
-using Microsoft.Practices.Unity;
using Plugin.Connectivity;
using Plugin.CurrentActivity;
using Plugin.Fingerprint;
@@ -16,11 +15,11 @@ using Plugin.Settings;
using PushNotification.Plugin;
using PushNotification.Plugin.Abstractions;
using XLabs.Ioc;
-using XLabs.Ioc.Unity;
using System.Threading.Tasks;
using Plugin.Settings.Abstractions;
-using Xamarin.Android.Net;
using FFImageLoading.Forms.Droid;
+using XLabs.Ioc.SimpleInjectorContainer;
+using SimpleInjector;
namespace Bit.Android
{
@@ -179,62 +178,68 @@ namespace Bit.Android
public static void SetIoc(Application application)
{
UserDialogs.Init(application);
-
- var container = new UnityContainer();
-
- container
- // Android Stuff
- .RegisterInstance(application.ApplicationContext)
- .RegisterInstance(application)
- // Services
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Repositories
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Other
- .RegisterInstance(CrossSettings.Current, new ContainerControlledLifetimeManager())
- .RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
- .RegisterInstance(UserDialogs.Instance, new ContainerControlledLifetimeManager())
- .RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager());
-
- CrossPushNotification.Initialize(container.Resolve(), "962181367620");
- container.RegisterInstance(CrossPushNotification.Current, new ContainerControlledLifetimeManager());
CachedImageRenderer.Init();
-
- Resolver.SetResolver(new UnityResolver(container));
CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
+
+ //var container = new UnityContainer();
+ var container = new Container();
+
+ // Android Stuff
+ container.RegisterSingleton(application.ApplicationContext);
+ container.RegisterSingleton(application);
+
+ // Services
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+
+ // Repositories
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+
+ // Other
+ container.RegisterSingleton(CrossSettings.Current);
+ container.RegisterSingleton(CrossConnectivity.Current);
+ container.RegisterSingleton(UserDialogs.Instance);
+ container.RegisterSingleton(CrossFingerprint.Current);
+
+ // Push
+ var pushListener = new PushNotificationListener();
+ container.RegisterSingleton(pushListener);
+ CrossPushNotification.Initialize(pushListener, "962181367620");
+ container.RegisterSingleton(CrossPushNotification.Current);
+
+ container.Verify();
+ Resolver.SetResolver(new SimpleInjectorResolver(container));
}
}
}
\ No newline at end of file
diff --git a/src/Android/app.config b/src/Android/app.config
index 3e8f6e556..c2e6c881a 100644
--- a/src/Android/app.config
+++ b/src/Android/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/Android/packages.config b/src/Android/packages.config
index d69ce9eca..d87f81023 100644
--- a/src/Android/packages.config
+++ b/src/Android/packages.config
@@ -6,6 +6,9 @@
+
+
+
@@ -14,6 +17,7 @@
+
@@ -23,7 +27,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -45,5 +91,5 @@
-
+
\ No newline at end of file
diff --git a/src/App/App.csproj b/src/App/App.csproj
index f9a2cfc3b..59d9433ba 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -368,10 +368,6 @@
..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
True
-
- ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll
- True
-
..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v6.0\Mono.Android.dll
diff --git a/src/App/Utilities/ApiHttpClient.cs b/src/App/Utilities/ApiHttpClient.cs
index 9eb7bc695..163643995 100644
--- a/src/App/Utilities/ApiHttpClient.cs
+++ b/src/App/Utilities/ApiHttpClient.cs
@@ -20,7 +20,7 @@ namespace Bit.App
private void Init()
{
//BaseAddress = new Uri("http://169.254.80.80:4000"); // Desktop from VS Android Emulator
- //BaseAddress = new Uri("http://192.168.1.8:4000"); // Desktop
+ //BaseAddress = new Uri("http://192.168.1.6:4000"); // Desktop
//BaseAddress = new Uri("https://preview-api.bitwarden.com"); // Preview
BaseAddress = new Uri("https://api.bitwarden.com"); // Production
DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
diff --git a/src/App/Utilities/IdentityHttpClient.cs b/src/App/Utilities/IdentityHttpClient.cs
index e5cd501da..58d509c48 100644
--- a/src/App/Utilities/IdentityHttpClient.cs
+++ b/src/App/Utilities/IdentityHttpClient.cs
@@ -20,7 +20,7 @@ namespace Bit.App
private void Init()
{
//BaseAddress = new Uri("http://169.254.80.80:33656"); // Desktop from VS Android Emulator
- //BaseAddress = new Uri("http://192.168.1.8:33656"); // Desktop
+ //BaseAddress = new Uri("http://192.168.1.6:33656"); // Desktop
//BaseAddress = new Uri("https://identity-api.bitwarden.com"); // Preview
BaseAddress = new Uri("https://identity.bitwarden.com"); // Production
DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
diff --git a/src/App/packages.config b/src/App/packages.config
index 4745100e0..84b9e923e 100644
--- a/src/App/packages.config
+++ b/src/App/packages.config
@@ -16,7 +16,6 @@
-
diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index 2c23fc69b..64cf0beea 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -6,10 +6,8 @@ using Bit.App.Repositories;
using Bit.App.Services;
using Bit.iOS.Core.Services;
using Foundation;
-using Microsoft.Practices.Unity;
using UIKit;
using XLabs.Ioc;
-using XLabs.Ioc.Unity;
using Bit.iOS.Core;
using Newtonsoft.Json;
using Bit.iOS.Extension.Models;
@@ -20,6 +18,8 @@ using Plugin.Fingerprint;
using Bit.iOS.Core.Utilities;
using Bit.App.Resources;
using Bit.iOS.Core.Controllers;
+using SimpleInjector;
+using XLabs.Ioc.SimpleInjectorContainer;
namespace Bit.iOS.Extension
{
@@ -260,46 +260,47 @@ namespace Bit.iOS.Extension
private void SetIoc()
{
- var container = new UnityContainer();
+ var container = new Container();
- container
- // Services
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Repositories
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Other
- .RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
- .RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager());
+ // Services
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
- ISettings settings = new Settings("group.com.8bit.bitwarden");
- container.RegisterInstance(settings, new ContainerControlledLifetimeManager());
+ // Repositories
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
- Resolver.ResetResolver(new UnityResolver(container));
+ // Other
+ container.RegisterSingleton(CrossConnectivity.Current);
+ container.RegisterSingleton(CrossFingerprint.Current);
+
+ var settings = new Settings("group.com.8bit.bitwarden");
+ container.RegisterSingleton(settings);
+
+ Resolver.ResetResolver(new SimpleInjectorResolver(container));
}
private void SetCulture()
diff --git a/src/iOS.Extension/app.config b/src/iOS.Extension/app.config
index 3e8f6e556..c2e6c881a 100644
--- a/src/iOS.Extension/app.config
+++ b/src/iOS.Extension/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj
index e9591ac52..87422b93a 100644
--- a/src/iOS.Extension/iOS.Extension.csproj
+++ b/src/iOS.Extension/iOS.Extension.csproj
@@ -253,7 +253,9 @@
LoadingViewController.cs
-
+
+ Designer
+
@@ -321,6 +323,9 @@
..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll
+
+ ..\..\packages\SimpleInjector.4.0.7\lib\netstandard1.3\SimpleInjector.dll
+
..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll
True
@@ -351,6 +356,8 @@
+
+
..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll
True
@@ -359,14 +366,11 @@
..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
-
- ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll
-
..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll
-
- ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll
+
+ ..\..\packages\XLabs.IoC.SimpleInjector.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.SimpleInjector.dll
diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config
index 124991dbd..a16e4fd95 100644
--- a/src/iOS.Extension/packages.config
+++ b/src/iOS.Extension/packages.config
@@ -3,6 +3,9 @@
+
+
+
@@ -10,18 +13,61 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/iOS/AppDelegate.cs b/src/iOS/AppDelegate.cs
index ab7fb5ec2..01c1d77e1 100644
--- a/src/iOS/AppDelegate.cs
+++ b/src/iOS/AppDelegate.cs
@@ -2,13 +2,11 @@
using System.Collections.Generic;
using System.Linq;
using XLabs.Ioc;
-using XLabs.Ioc.Unity;
using Foundation;
using UIKit;
using Bit.App.Abstractions;
using Bit.App.Services;
-using Microsoft.Practices.Unity;
using Bit.iOS.Services;
using Plugin.Connectivity;
using Acr.UserDialogs;
@@ -26,6 +24,8 @@ using HockeyApp.iOS;
using Bit.iOS.Core;
using Google.Analytics;
using FFImageLoading.Forms.Touch;
+using SimpleInjector;
+using XLabs.Ioc.SimpleInjectorContainer;
namespace Bit.iOS
{
@@ -244,58 +244,61 @@ namespace Bit.iOS
private void SetIoc()
{
- var container = new UnityContainer();
+ var container = new Container();
- container
- // Services
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Repositories
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- .RegisterType(new ContainerControlledLifetimeManager())
- // Other
- .RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
- .RegisterInstance(UserDialogs.Instance, new ContainerControlledLifetimeManager())
- .RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager());
+ // Services
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+
+ // Repositories
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+ container.RegisterSingleton();
+
+ // Other
+ container.RegisterSingleton(CrossConnectivity.Current);
+ container.RegisterSingleton(UserDialogs.Instance);
+ container.RegisterSingleton(CrossFingerprint.Current);
Settings = new Settings("group.com.8bit.bitwarden");
- container.RegisterInstance(Settings, new ContainerControlledLifetimeManager());
+ container.RegisterSingleton(Settings);
- CrossPushNotification.Initialize(container.Resolve());
- container.RegisterInstance(CrossPushNotification.Current, new ContainerControlledLifetimeManager());
+ // Push
+ var pushListener = new PushNotificationListener();
+ container.RegisterSingleton(pushListener);
+ CrossPushNotification.Initialize(pushListener);
+ container.RegisterSingleton(CrossPushNotification.Current);
CachedImageRenderer.Init();
- Resolver.SetResolver(new UnityResolver(container));
+ Resolver.SetResolver(new SimpleInjectorResolver(container));
}
///
diff --git a/src/iOS/app.config b/src/iOS/app.config
index 3e8f6e556..c2e6c881a 100644
--- a/src/iOS/app.config
+++ b/src/iOS/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj
index 500cae639..46c33f6a3 100644
--- a/src/iOS/iOS.csproj
+++ b/src/iOS/iOS.csproj
@@ -343,6 +343,9 @@
..\..\packages\Xam.Plugin.PushNotification.1.2.4\lib\Xamarin.iOS10\PushNotification.Plugin.Abstractions.dll
True
+
+ ..\..\packages\SimpleInjector.4.0.7\lib\netstandard1.3\SimpleInjector.dll
+
..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll
True
@@ -373,6 +376,8 @@
+
+
..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll
True
@@ -396,17 +401,14 @@
..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
-
- ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll
-
..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll
..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll
-
- ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll
+
+ ..\..\packages\XLabs.IoC.SimpleInjector.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.SimpleInjector.dll
diff --git a/src/iOS/packages.config b/src/iOS/packages.config
index 53ff141b0..5e282ae7d 100644
--- a/src/iOS/packages.config
+++ b/src/iOS/packages.config
@@ -5,6 +5,9 @@
+
+
+
@@ -12,6 +15,7 @@
+
@@ -19,7 +23,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31,5 +77,5 @@
-
+
\ No newline at end of file
diff --git a/test/Android.Test/app.config b/test/Android.Test/app.config
index 3e8f6e556..c2e6c881a 100644
--- a/test/Android.Test/app.config
+++ b/test/Android.Test/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/test/iOS.Test/app.config b/test/iOS.Test/app.config
index 3e8f6e556..c2e6c881a 100644
--- a/test/iOS.Test/app.config
+++ b/test/iOS.Test/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file