diff --git a/.gitignore b/.gitignore index f9e9569..0b24d23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +Components +[Pp]ackages +*.userprefs +Resource.designer.cs # Visual Studio (>=2015) project-specific, machine local files .vs/ @@ -192,4 +196,4 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ -.vscode/settings.json \ No newline at end of file +.vscode/settings.json diff --git a/Droid/packages.config b/Droid/packages.config index 0c5e39d..e265ba5 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -2,16 +2,16 @@ - - - - + + + + - + - + @@ -21,10 +21,10 @@ - - + + - + @@ -34,26 +34,26 @@ - + - + - + - - - - - + + + + + - + @@ -73,33 +73,33 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index 4faaef9..caf5b88 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -62,10 +62,10 @@ ..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll - ..\packages\AndHUD.1.4.1\lib\MonoAndroid81\AndHUD.dll + ..\packages\AndHUD.1.4.2\lib\MonoAndroid81\AndHUD.dll - ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.1\lib\monoandroid81\Xamarin.Android.Arch.Core.Common.dll + ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid81\Xamarin.Android.Arch.Core.Common.dll @@ -74,110 +74,104 @@ - ..\packages\Zeroconf.3.0.30\lib\netstandard2.0\Zeroconf.dll + ..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll - ..\packages\Acr.UserDialogs.7.0.4\lib\monoandroid81\Acr.UserDialogs.dll + ..\packages\Acr.UserDialogs.7.1.0.442\lib\netstandard2.0\Acr.UserDialogs.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll ..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll - ..\packages\Splat.8.1.1\lib\monoandroid81\Splat.dll + ..\packages\Splat.9.4.5\lib\netstandard2.0\Splat.dll - ..\packages\System.Reactive.4.1.6\lib\netstandard2.0\System.Reactive.dll + ..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll - ..\packages\System.Reactive.Core.4.1.6\lib\netstandard2.0\System.Reactive.Core.dll + ..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll - ..\packages\System.Reactive.Interfaces.4.1.6\lib\netstandard2.0\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll - ..\packages\System.Reactive.Linq.4.1.6\lib\netstandard2.0\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll - ..\packages\System.Reactive.PlatformServices.4.1.6\lib\netstandard2.0\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll - ..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Annotations.dll + ..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Annotations.dll - ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.1\lib\monoandroid81\Xamarin.Android.Arch.Lifecycle.Common.dll + ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid81\Xamarin.Android.Arch.Lifecycle.Common.dll - ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.1\lib\monoandroid81\Xamarin.Android.Arch.Lifecycle.Runtime.dll + ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.3\lib\monoandroid81\Xamarin.Android.Arch.Lifecycle.Runtime.dll - ..\packages\Xamarin.Android.Support.Compat.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Fragment.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Transition.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Transition.dll + ..\packages\Xamarin.Android.Support.Transition.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Transition.dll - ..\packages\Xamarin.Android.Support.v4.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.CardView.dll + ..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v7.CardView.dll - ..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.Palette.dll + ..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v7.Palette.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.Design.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Design.dll + ..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.Design.dll - ..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\FormsViewGroup.dll + ..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\netstandard2.0\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\netstandard2.0\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\netstandard2.0\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.CustomTabs.dll + ..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid81\Xamarin.Android.Support.CustomTabs.dll - ..\packages\Xamarin.Essentials.1.2.0\lib\monoandroid81\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.5.3.2\lib\monoandroid81\Xamarin.Essentials.dll @@ -220,25 +214,25 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iOS/packages.config b/iOS/packages.config index 4f2b169..d144e44 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -1,28 +1,28 @@  - - - - + + + + - + - + - - + + - + @@ -32,27 +32,27 @@ - + - + - + - - - - - + + + + + - + - + @@ -69,13 +69,13 @@ - - + + - - - + + + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index b78e2bd..cc58e71 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -88,10 +88,10 @@ - ..\packages\BTProgressHUD.1.2.0.6\lib\Xamarin.iOS10\BTProgressHUD.dll + ..\packages\BTProgressHUD.1.3.2\lib\xamarinios10\BTProgressHUD.dll - ..\packages\Acr.UserDialogs.7.0.4\lib\xamarinios10\Acr.UserDialogs.dll + ..\packages\Acr.UserDialogs.7.1.0.442\lib\xamarinios10\Acr.UserDialogs.dll @@ -99,43 +99,40 @@ - ..\packages\Zeroconf.3.0.30\lib\netstandard2.0\Zeroconf.dll + ..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll ..\packages\Acr.Settings.9.0.1\lib\xamarinios10\Acr.Settings.dll - ..\packages\System.Reactive.4.1.6\lib\netstandard2.0\System.Reactive.dll + ..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll - ..\packages\System.Reactive.Core.4.1.6\lib\netstandard2.0\System.Reactive.Core.dll + ..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll - ..\packages\System.Reactive.Interfaces.4.1.6\lib\netstandard2.0\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll - ..\packages\System.Reactive.Linq.4.1.6\lib\netstandard2.0\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll - ..\packages\System.Reactive.PlatformServices.4.1.6\lib\netstandard2.0\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Essentials.1.2.0\lib\xamarinios10\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.5.3.2\lib\xamarinios10\Xamarin.Essentials.dll ..\packages\Serilog.2.9.0\lib\netstandard2.0\Serilog.dll @@ -143,6 +140,7 @@ ..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\Xamarin.iOS10\Serilog.Sinks.Xamarin.dll + @@ -223,5 +221,6 @@ - + + \ No newline at end of file diff --git a/packages/BTProgressHUD.1.2.0.6/lib/Xamarin.iOS10/BTProgressHUD.dll b/packages/BTProgressHUD.1.2.0.6/lib/Xamarin.iOS10/BTProgressHUD.dll deleted file mode 100755 index 3676522..0000000 Binary files a/packages/BTProgressHUD.1.2.0.6/lib/Xamarin.iOS10/BTProgressHUD.dll and /dev/null differ diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index d49b558..d454d40 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -53,12 +53,12 @@ - - - + + + - - + +