From c42a1504a7796f3a98cc6d728b994ea1e2d5416e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 1 Aug 2016 21:15:09 -0400 Subject: [PATCH] upadted package and isntalled pclcrypto into device projects --- Android.Test/Android.Test.csproj | 1 + Android.Test/app.config | 11 +++++++ src/Android/Android.csproj | 38 ++++++++++++++++++---- src/Android/Resources/Resource.Designer.cs | 2 ++ src/Android/packages.config | 14 +++++--- src/App/App.csproj | 12 +++---- src/App/packages.config | 6 ++-- src/iOS.Core/iOS.Core.csproj | 4 +-- src/iOS.Core/packages.config | 4 +-- src/iOS.Extension/iOS.Extension.csproj | 36 ++++++++++++++++---- src/iOS.Extension/packages.config | 12 +++++-- src/iOS/iOS.csproj | 36 ++++++++++++++++---- src/iOS/packages.config | 12 +++++-- test/iOS.Test/app.config | 11 +++++++ test/iOS.Test/iOS.Test.csproj | 1 + 15 files changed, 158 insertions(+), 42 deletions(-) create mode 100644 Android.Test/app.config create mode 100644 test/iOS.Test/app.config diff --git a/Android.Test/Android.Test.csproj b/Android.Test/Android.Test.csproj index 4d4e5a58b..1a9bff47c 100644 --- a/Android.Test/Android.Test.csproj +++ b/Android.Test/Android.Test.csproj @@ -64,6 +64,7 @@ + diff --git a/Android.Test/app.config b/Android.Test/app.config new file mode 100644 index 000000000..8460dd432 --- /dev/null +++ b/Android.Test/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index ec313a856..d38f2b0d8 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -123,12 +123,32 @@ ..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\MonoAndroid10\Plugin.Connectivity.dll + + ..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll + + ..\..\packages\PInvoke.BCrypt.0.3.2\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 + True + + + ..\..\packages\PInvoke.NCrypt.0.3.2\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 + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\MonoAndroid10\Plugin.Connectivity.dll + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll True @@ -176,19 +196,23 @@ True - ..\..\packages\SQLitePCL.bundle_green.0.9.2\lib\MonoAndroid\SQLitePCL.batteries.dll + ..\..\packages\SQLitePCL.bundle_green.0.9.3\lib\MonoAndroid\SQLitePCL.batteries.dll True - ..\..\packages\SQLitePCL.raw.0.9.2\lib\MonoAndroid\SQLitePCL.raw.dll + ..\..\packages\SQLitePCL.raw.0.9.3\lib\MonoAndroid\SQLitePCL.raw.dll True - ..\..\packages\SQLitePCL.plugin.sqlite3.android.0.9.2\lib\MonoAndroid\SQLitePCLPlugin_esqlite3.dll + ..\..\packages\SQLitePCL.plugin.sqlite3.android.0.9.3\lib\MonoAndroid\SQLitePCLPlugin_esqlite3.dll True + + ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + True + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll True diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index da8669a0f..e616142e1 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -184,6 +184,8 @@ namespace Bit.Android global::HockeyApp.Resource.Style.HockeyApp_EditTextStyle = global::Bit.Android.Resource.Style.HockeyApp_EditTextStyle; global::HockeyApp.Resource.Style.HockeyApp_SingleLineInputStyle = global::Bit.Android.Resource.Style.HockeyApp_SingleLineInputStyle; global::ModernHttpClient.Resource.String.library_name = global::Bit.Android.Resource.String.library_name; + global::PCLCrypto.Resource.String.ApplicationName = global::Bit.Android.Resource.String.ApplicationName; + global::PCLCrypto.Resource.String.Hello = global::Bit.Android.Resource.String.Hello; global::Plugin.Fingerprint.Resource.Drawable.fingerprint_white = global::Bit.Android.Resource.Drawable.fingerprint_white; global::Plugin.Fingerprint.Resource.Id.fingerprint_btnCancel = global::Bit.Android.Resource.Id.fingerprint_btnCancel; global::Plugin.Fingerprint.Resource.Id.fingerprint_txtReason = global::Bit.Android.Resource.Id.fingerprint_txtReason; diff --git a/src/Android/packages.config b/src/Android/packages.config index e6a601f5b..43b7e9a2e 100644 --- a/src/Android/packages.config +++ b/src/Android/packages.config @@ -7,15 +7,21 @@ + + + + + - - - + + + - + + diff --git a/src/App/App.csproj b/src/App/App.csproj index cabe2c0c0..029ae51e1 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -237,12 +237,12 @@ ..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\portable-net45+wp80+wp81+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+Xamarin.Mac20+UAP10\Plugin.Connectivity.dll + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\portable-net45+wp80+wp81+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+Xamarin.Mac20+UAP10\Plugin.Connectivity.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\portable-net45+wp80+wp81+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+Xamarin.Mac20+UAP10\Plugin.Connectivity.Abstractions.dll + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\portable-net45+wp80+wp81+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+Xamarin.Mac20+UAP10\Plugin.Connectivity.Abstractions.dll True @@ -286,11 +286,11 @@ True - ..\..\packages\SQLitePCL.bundle_green.0.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll + ..\..\packages\SQLitePCL.bundle_green.0.9.3\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll True - ..\..\packages\SQLitePCL.raw.0.9.2\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.raw.dll + ..\..\packages\SQLitePCL.raw.0.9.3\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.raw.dll True diff --git a/src/App/packages.config b/src/App/packages.config index e5bed50be..8cc705e16 100644 --- a/src/App/packages.config +++ b/src/App/packages.config @@ -13,11 +13,11 @@ - - + + - + diff --git a/src/iOS.Core/iOS.Core.csproj b/src/iOS.Core/iOS.Core.csproj index bd2910d8f..db0f791b3 100644 --- a/src/iOS.Core/iOS.Core.csproj +++ b/src/iOS.Core/iOS.Core.csproj @@ -58,11 +58,11 @@ True - ..\..\packages\SQLitePCL.bundle_green.0.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll + ..\..\packages\SQLitePCL.bundle_green.0.9.3\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll True - ..\..\packages\SQLitePCL.raw.0.9.2\lib\Xamarin.iOS10\SQLitePCL.raw.dll + ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True diff --git a/src/iOS.Core/packages.config b/src/iOS.Core/packages.config index 993d561f9..7030dc899 100644 --- a/src/iOS.Core/packages.config +++ b/src/iOS.Core/packages.config @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index f409de478..b979cdecf 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -174,12 +174,32 @@ ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\Xamarin.iOS10\Plugin.Connectivity.dll + + ..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll + + ..\..\packages\PInvoke.BCrypt.0.3.2\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 + True + + + ..\..\packages\PInvoke.NCrypt.0.3.2\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 + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\Xamarin.iOS10\Plugin.Connectivity.dll + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll True @@ -203,15 +223,19 @@ True - ..\..\packages\SQLitePCL.bundle_green.0.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll + ..\..\packages\SQLitePCL.bundle_green.0.9.3\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll True - ..\..\packages\SQLitePCL.raw.0.9.2\lib\Xamarin.iOS10\SQLitePCL.raw.dll + ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True + + ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + True + ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config index 0cd7f8d31..dfe07c492 100644 --- a/src/iOS.Extension/packages.config +++ b/src/iOS.Extension/packages.config @@ -5,12 +5,18 @@ + + + + + - - + + - + + diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 7908a1372..e56f529e6 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -192,12 +192,32 @@ ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\Xamarin.iOS10\Plugin.Connectivity.dll + + ..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll True - - ..\..\packages\Xam.Plugin.Connectivity.2.2.2\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll + + ..\..\packages\PInvoke.BCrypt.0.3.2\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 + True + + + ..\..\packages\PInvoke.NCrypt.0.3.2\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 + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\Xamarin.iOS10\Plugin.Connectivity.dll + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll True @@ -221,15 +241,19 @@ True - ..\..\packages\SQLitePCL.bundle_green.0.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll + ..\..\packages\SQLitePCL.bundle_green.0.9.3\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.batteries.dll True - ..\..\packages\SQLitePCL.raw.0.9.2\lib\Xamarin.iOS10\SQLitePCL.raw.dll + ..\..\packages\SQLitePCL.raw.0.9.3\lib\Xamarin.iOS10\SQLitePCL.raw.dll True + + ..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + True + ..\..\packages\Xamarin.Forms.2.3.0.107\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll True diff --git a/src/iOS/packages.config b/src/iOS/packages.config index e2c0e10d7..3c835e830 100644 --- a/src/iOS/packages.config +++ b/src/iOS/packages.config @@ -7,13 +7,19 @@ + + + + + - - + + - + + diff --git a/test/iOS.Test/app.config b/test/iOS.Test/app.config new file mode 100644 index 000000000..8460dd432 --- /dev/null +++ b/test/iOS.Test/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/test/iOS.Test/iOS.Test.csproj b/test/iOS.Test/iOS.Test.csproj index 93e514a85..f21f5510c 100644 --- a/test/iOS.Test/iOS.Test.csproj +++ b/test/iOS.Test/iOS.Test.csproj @@ -89,6 +89,7 @@ +