From 6c554b4d51bd5d2b952f58a46c8908347c7ca39c Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 6 Dec 2016 22:27:14 -0500 Subject: [PATCH] update lots of packages. --- src/Android/Android.csproj | 50 +++++++++++----- src/Android/MainActivity.cs | 3 + src/Android/Properties/AndroidManifest.xml | 1 + src/Android/app.config | 4 ++ src/Android/packages.config | 20 ++++--- src/App/App.csproj | 38 ++++++++---- src/App/Pages/Vault/VaultListSitesPage.cs | 2 +- src/App/app.config | 4 ++ src/App/packages.config | 18 +++--- src/iOS.Core/app.config | 4 ++ src/iOS.Core/iOS.Core.csproj | 40 +++++++++---- src/iOS.Core/packages.config | 11 ++-- src/iOS.Extension/app.config | 4 ++ src/iOS.Extension/iOS.Extension.csproj | 52 ++++++++++------ src/iOS.Extension/packages.config | 21 ++++--- src/iOS/app.config | 4 ++ src/iOS/iOS.csproj | 60 ++++++++++++------- src/iOS/packages.config | 23 +++---- test/Android.Test/Android.Test.csproj | 20 +++++-- .../Resources/Resource.Designer.cs | 4 ++ test/Android.Test/app.config | 4 ++ test/Android.Test/packages.config | 11 ++-- test/App.Test/App.Test.csproj | 28 +++++---- test/App.Test/app.config | 4 ++ test/App.Test/packages.config | 13 ++-- test/iOS.Test/app.config | 4 ++ test/iOS.Test/iOS.Test.csproj | 34 +++++++---- test/iOS.Test/packages.config | 15 ++--- 28 files changed, 331 insertions(+), 165 deletions(-) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 2fd0761b2..27bd91f2f 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -75,11 +75,11 @@ True - ..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\MonoAndroid10\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll True @@ -121,19 +121,19 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True @@ -156,12 +156,12 @@ ..\..\packages\Plugin.Fingerprint.1.2.0\lib\MonoAndroid\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\MonoAndroid10\Plugin.Settings.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\MonoAndroid10\Plugin.Settings.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll True @@ -177,7 +177,7 @@ True - ..\..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll + ..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll True @@ -192,10 +192,30 @@ ..\..\packages\SQLitePCL.plugin.sqlite3.android.0.9.3\lib\MonoAndroid\SQLitePCLPlugin_esqlite3.dll True + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\MonoAndroid\SQLitePCLRaw.batteries_green.dll + True + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\MonoAndroid\SQLitePCLRaw.batteries_v2.dll + True + + + ..\..\packages\SQLitePCLRaw.core.1.1.1\lib\MonoAndroid\SQLitePCLRaw.core.dll + True + + + ..\..\packages\SQLitePCLRaw.lib.e_sqlite3.android.1.1.1\lib\MonoAndroid\SQLitePCLRaw.lib.e_sqlite3.dll + True + + + ..\..\packages\SQLitePCLRaw.provider.e_sqlite3.android.1.1.1\lib\MonoAndroid\SQLitePCLRaw.provider.e_sqlite3.dll + True + - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True @@ -305,7 +325,9 @@ - + + Designer + Designer diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs index 9f3715fca..553aea00a 100644 --- a/src/Android/MainActivity.cs +++ b/src/Android/MainActivity.cs @@ -27,6 +27,9 @@ namespace Bit.Android protected override void OnCreate(Bundle bundle) { + var policy = new StrictMode.ThreadPolicy.Builder().PermitAll().Build(); + StrictMode.SetThreadPolicy(policy); + ToolbarResource = Resource.Layout.toolbar; TabLayoutResource = Resource.Layout.tabs; diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml index fc83793af..cd0f40444 100644 --- a/src/Android/Properties/AndroidManifest.xml +++ b/src/Android/Properties/AndroidManifest.xml @@ -3,6 +3,7 @@ + diff --git a/src/Android/app.config b/src/Android/app.config index 8460dd432..3e8f6e556 100644 --- a/src/Android/app.config +++ b/src/Android/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/Android/packages.config b/src/Android/packages.config index d263bebb2..3b7ead49b 100644 --- a/src/Android/packages.config +++ b/src/Android/packages.config @@ -1,29 +1,33 @@  - + - - - - + + + + - + + + + + - + - + diff --git a/src/App/App.csproj b/src/App/App.csproj index 02f9f7cb7..01b3cfd37 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -201,11 +201,11 @@ - ..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll True @@ -229,19 +229,19 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True @@ -260,12 +260,12 @@ ..\..\packages\Plugin.Fingerprint.1.2.0\lib\portable-net45+win8+wpa81+wp8\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.Settings.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Plugin.Settings.Abstractions.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll True @@ -281,7 +281,7 @@ True - ..\..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll + ..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll True @@ -292,8 +292,20 @@ ..\..\packages\SQLitePCL.raw.0.9.3\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.raw.dll True - - ..\..\packages\Validation.2.2.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Validation.dll + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll + True + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll + True + + + ..\..\packages\SQLitePCLRaw.core.1.1.1\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll + True + + + ..\..\packages\Validation.2.3.7\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Validation.dll True diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs index 3abd13da1..76966d374 100644 --- a/src/App/Pages/Vault/VaultListSitesPage.cs +++ b/src/App/Pages/Vault/VaultListSitesPage.cs @@ -242,7 +242,7 @@ namespace Bit.App.Pages { Message = AppResources.PushNotificationAlert, Title = AppResources.EnableAutomaticSyncing, - OnOk = registerAction, + OnAction = registerAction, OkText = AppResources.OkGotIt }); } diff --git a/src/App/app.config b/src/App/app.config index 8460dd432..3e8f6e556 100644 --- a/src/App/app.config +++ b/src/App/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/App/packages.config b/src/App/packages.config index 9858794a4..888af335c 100644 --- a/src/App/packages.config +++ b/src/App/packages.config @@ -1,24 +1,26 @@  - + - - - - + + + + - + + + - + - + \ No newline at end of file diff --git a/src/iOS.Core/app.config b/src/iOS.Core/app.config index 8460dd432..3e8f6e556 100644 --- a/src/iOS.Core/app.config +++ b/src/iOS.Core/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/iOS.Core/iOS.Core.csproj b/src/iOS.Core/iOS.Core.csproj index 4b7e5cfe4..3e5f99520 100644 --- a/src/iOS.Core/iOS.Core.csproj +++ b/src/iOS.Core/iOS.Core.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -35,7 +35,7 @@ - ..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\lib\Xamarin.iOS10\Google.Analytics.dll + ..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0\lib\Xamarin.iOS10\Google.Analytics.dll True @@ -50,16 +50,16 @@ ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll True - ..\..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll + ..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll True @@ -70,6 +70,22 @@ ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll + True + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll + True + + + ..\..\packages\SQLitePCLRaw.core.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll + True + + + ..\..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll + True + @@ -119,10 +135,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + \ No newline at end of file diff --git a/src/iOS.Core/packages.config b/src/iOS.Core/packages.config index be66be12a..618967f9e 100644 --- a/src/iOS.Core/packages.config +++ b/src/iOS.Core/packages.config @@ -2,11 +2,14 @@ - + - - - + + + + + + \ No newline at end of file diff --git a/src/iOS.Extension/app.config b/src/iOS.Extension/app.config index 8460dd432..3e8f6e556 100644 --- a/src/iOS.Extension/app.config +++ b/src/iOS.Extension/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index 9dee90e0c..1799519c3 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -262,7 +262,7 @@ True - ..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\lib\Xamarin.iOS10\Google.Analytics.dll + ..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0\lib\Xamarin.iOS10\Google.Analytics.dll True @@ -282,19 +282,19 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True @@ -313,16 +313,16 @@ ..\..\packages\Plugin.Fingerprint.1.2.0\lib\Xamarin.iOS10\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll True - ..\..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll + ..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll True @@ -333,10 +333,26 @@ ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll + True + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll + True + + + ..\..\packages\SQLitePCLRaw.core.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll + True + + + ..\..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll + True + - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True @@ -387,10 +403,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + \ No newline at end of file diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config index 33893be00..46185cc26 100644 --- a/src/iOS.Extension/packages.config +++ b/src/iOS.Extension/packages.config @@ -5,20 +5,23 @@ - - - - + + + + - + + + + - + - - - + + + \ No newline at end of file diff --git a/src/iOS/app.config b/src/iOS/app.config index 8460dd432..3e8f6e556 100644 --- a/src/iOS/app.config +++ b/src/iOS/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 70f251e87..3db0f535e 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -231,7 +231,9 @@ - + + Designer + @@ -257,11 +259,11 @@ True - ..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\Xamarin.iOS10\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.3.2\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll True @@ -269,7 +271,7 @@ True - ..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\lib\Xamarin.iOS10\Google.Analytics.dll + ..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0\lib\Xamarin.iOS10\Google.Analytics.dll True @@ -289,19 +291,19 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True @@ -320,12 +322,12 @@ ..\..\packages\Plugin.Fingerprint.1.2.0\lib\Xamarin.iOS10\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll True @@ -337,7 +339,7 @@ True - ..\..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll + ..\..\packages\sqlite-net-pcl.1.2.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll True @@ -348,10 +350,26 @@ ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll + True + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll + True + + + ..\..\packages\SQLitePCLRaw.core.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll + True + + + ..\..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.1\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll + True + - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True @@ -677,12 +695,12 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + \ No newline at end of file diff --git a/src/iOS/packages.config b/src/iOS/packages.config index dafbb9b38..8fbbb7d11 100644 --- a/src/iOS/packages.config +++ b/src/iOS/packages.config @@ -1,29 +1,32 @@  - + - - - - + + + + - + + + + - + - - + + - + \ No newline at end of file diff --git a/test/Android.Test/Android.Test.csproj b/test/Android.Test/Android.Test.csproj index 648d5e3c1..a58c27213 100644 --- a/test/Android.Test/Android.Test.csproj +++ b/test/Android.Test/Android.Test.csproj @@ -63,25 +63,33 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + True + + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\MonoAndroid\Plugin.Fingerprint.dll + True + + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\MonoAndroid\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True diff --git a/test/Android.Test/Resources/Resource.Designer.cs b/test/Android.Test/Resources/Resource.Designer.cs index 20840f007..47706945b 100644 --- a/test/Android.Test/Resources/Resource.Designer.cs +++ b/test/Android.Test/Resources/Resource.Designer.cs @@ -28,6 +28,10 @@ namespace Bit.Android.Test { global::PCLCrypto.Resource.String.ApplicationName = global::Bit.Android.Test.Resource.String.ApplicationName; global::PCLCrypto.Resource.String.Hello = global::Bit.Android.Test.Resource.String.Hello; + global::Plugin.Fingerprint.Resource.Drawable.fingerprint_white = global::Bit.Android.Test.Resource.Drawable.fingerprint_white; + global::Plugin.Fingerprint.Resource.Id.fingerprint_btnCancel = global::Bit.Android.Test.Resource.Id.fingerprint_btnCancel; + global::Plugin.Fingerprint.Resource.Id.fingerprint_txtReason = global::Bit.Android.Test.Resource.Id.fingerprint_txtReason; + global::Plugin.Fingerprint.Resource.Layout.FingerprintDialog = global::Bit.Android.Test.Resource.Layout.FingerprintDialog; global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::Bit.Android.Test.Resource.Id.OptionHostName; global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::Bit.Android.Test.Resource.Id.OptionPort; global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::Bit.Android.Test.Resource.Id.OptionRemoteServer; diff --git a/test/Android.Test/app.config b/test/Android.Test/app.config index 8460dd432..3e8f6e556 100644 --- a/test/Android.Test/app.config +++ b/test/Android.Test/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/test/Android.Test/packages.config b/test/Android.Test/packages.config index 922f86e84..37873cfbd 100644 --- a/test/Android.Test/packages.config +++ b/test/Android.Test/packages.config @@ -1,9 +1,10 @@  - - - - - + + + + + + \ No newline at end of file diff --git a/test/App.Test/App.Test.csproj b/test/App.Test/App.Test.csproj index 0a0ed22a5..4c09482ec 100644 --- a/test/App.Test/App.Test.csproj +++ b/test/App.Test/App.Test.csproj @@ -47,32 +47,40 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\net40\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\net40\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\net40\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\net40\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\net40\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\net40\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\net45\Plugin.Settings.dll + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\net45\Plugin.Fingerprint.dll True - - ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\net45\Plugin.Settings.Abstractions.dll + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\net45\Plugin.Fingerprint.Abstractions.dll + True + + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\net45\Plugin.Settings.dll + True + + + ..\..\packages\Xam.Plugins.Settings.2.5.1.0\lib\net45\Plugin.Settings.Abstractions.dll True - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True diff --git a/test/App.Test/app.config b/test/App.Test/app.config index 8460dd432..3e8f6e556 100644 --- a/test/App.Test/app.config +++ b/test/App.Test/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/test/App.Test/packages.config b/test/App.Test/packages.config index b9a39c580..ecbae95ba 100644 --- a/test/App.Test/packages.config +++ b/test/App.Test/packages.config @@ -2,12 +2,13 @@ - - - - - - + + + + + + + diff --git a/test/iOS.Test/app.config b/test/iOS.Test/app.config index 8460dd432..3e8f6e556 100644 --- a/test/iOS.Test/app.config +++ b/test/iOS.Test/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/test/iOS.Test/iOS.Test.csproj b/test/iOS.Test/iOS.Test.csproj index 35495e6bb..762bf26bf 100644 --- a/test/iOS.Test/iOS.Test.csproj +++ b/test/iOS.Test/iOS.Test.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -105,7 +105,7 @@ - ..\..\packages\Xamarin.Google.iOS.Analytics.3.14.0.7\lib\Xamarin.iOS10\Google.Analytics.dll + ..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0\lib\Xamarin.iOS10\Google.Analytics.dll True @@ -116,25 +116,33 @@ True - ..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + ..\..\packages\PInvoke.BCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll True - ..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + ..\..\packages\PInvoke.Kernel32.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll True - ..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + ..\..\packages\PInvoke.NCrypt.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll True - ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + ..\..\packages\PInvoke.Windows.Core.0.3.152\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + True + + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\Xamarin.iOS10\Plugin.Fingerprint.dll + True + + + ..\..\packages\Plugin.Fingerprint.1.2.0\lib\Xamarin.iOS10\Plugin.Fingerprint.Abstractions.dll True - - ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\packages\Validation.2.3.7\lib\dotnet\Validation.dll True @@ -158,10 +166,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + \ No newline at end of file diff --git a/test/iOS.Test/packages.config b/test/iOS.Test/packages.config index c422ca954..da573beaf 100644 --- a/test/iOS.Test/packages.config +++ b/test/iOS.Test/packages.config @@ -1,11 +1,12 @@  - - - - - - - + + + + + + + + \ No newline at end of file