diff --git a/Droid/Resources/Resource.designer.cs b/Droid/Resources/Resource.designer.cs index c24d0da..f55b268 100644 --- a/Droid/Resources/Resource.designer.cs +++ b/Droid/Resources/Resource.designer.cs @@ -2,6 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,7 +15,7 @@ namespace qController.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.0.0.73")] public partial class Resource { diff --git a/Droid/packages.config b/Droid/packages.config index 96f034e..c9848d0 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -2,17 +2,18 @@ - + - - + + + @@ -176,10 +177,10 @@ - + - + diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index fd149ca..a7fae6d 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ Library qController.Droid qController.Droid - v12.0 + v13.0 True Resources\Resource.designer.cs Resource @@ -33,6 +33,7 @@ true true + None @@ -70,16 +71,16 @@ - ..\packages\AndHUD.1.4.3\lib\monoandroid81\AndHUD.dll + ..\packages\AndHUD.1.5.0\lib\monoandroid12.0\AndHUD.dll ..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll - ..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll + ..\packages\Serilog.2.12.0\lib\netstandard2.1\Serilog.dll - ..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\MonoAndroid403\Serilog.Sinks.Xamarin.dll + ..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\monoandroid90\Serilog.Sinks.Xamarin.dll ..\packages\Splat.14.1.17\lib\netstandard2.0\Splat.dll @@ -352,22 +353,22 @@ ..\packages\Xamarin.AndroidX.Browser.1.3.0.8\lib\monoandroid90\Xamarin.AndroidX.Browser.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\FormsViewGroup.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\FormsViewGroup.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Essentials.1.7.0\lib\monoandroid10.0\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.7.3\lib\monoandroid10.0\Xamarin.Essentials.dll ..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll @@ -466,6 +467,9 @@ ..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.5\lib\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.dll + + ..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll + @@ -603,8 +607,8 @@ - + \ No newline at end of file diff --git a/iOS/AppDelegate.cs b/iOS/AppDelegate.cs index ba04aad..0ea4184 100644 --- a/iOS/AppDelegate.cs +++ b/iOS/AppDelegate.cs @@ -10,7 +10,7 @@ namespace qController.iOS public override bool FinishedLaunching(UIApplication app, NSDictionary options) { global::Xamarin.Forms.Forms.Init(); - Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Error().CreateLogger(); + Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Debug().CreateLogger(); LoadApplication(new App()); diff --git a/iOS/packages.config b/iOS/packages.config index ffd6743..7a69355 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -2,14 +2,15 @@ - + - - + + + @@ -76,8 +77,8 @@ - - + + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 476fa28..840569b 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -1,6 +1,6 @@  - + Debug @@ -91,7 +91,7 @@ - ..\packages\BTProgressHUD.1.3.5\lib\xamarinios10\BTProgressHUD.dll + ..\packages\BTProgressHUD.1.5.0\lib\xamarinios10\BTProgressHUD.dll ..\packages\Acr.UserDialogs.7.2.0.562\lib\xamarinios10\Acr.UserDialogs.dll @@ -126,31 +126,36 @@ ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll - ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Essentials.1.7.1\lib\xamarinios10\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.7.3\lib\xamarinios10\Xamarin.Essentials.dll - ..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll + ..\packages\Serilog.2.12.0\lib\netstandard2.1\Serilog.dll - ..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\Xamarin.iOS10\Serilog.Sinks.Xamarin.dll + ..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\xamarinios10\Serilog.Sinks.Xamarin.dll ..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll - ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + ..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll + + + @@ -232,5 +237,5 @@ - + \ No newline at end of file diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index c8991af..62e9078 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -64,11 +64,12 @@ - + - - + + + @@ -81,6 +82,7 @@ +