diff --git a/Droid/packages.config b/Droid/packages.config index 863b9b0..59c295d 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -81,7 +81,7 @@ - + @@ -176,5 +176,5 @@ - + \ No newline at end of file diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index f6e78a0..be692f7 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -141,9 +141,6 @@ ..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\monoandroid90\Serilog.Sinks.Xamarin.dll - - ..\packages\TcpSharp.1.2.0\lib\netstandard2.1\TcpSharp.dll - ..\packages\Xamarin.AndroidX.Activity.1.8.1\lib\monoandroid12.0\Xamarin.AndroidX.Activity.dll @@ -419,9 +416,6 @@ ..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll - - ..\packages\Zeroconf.3.6.11\lib\netstandard2.0\Zeroconf.dll - ..\packages\Xamarin.AndroidX.Browser.1.5.0.3\lib\monoandroid12.0\Xamarin.AndroidX.Browser.dll @@ -449,6 +443,12 @@ ..\packages\Xamarin.Forms.5.0.0.2622\lib\MonoAndroid13.0\Xamarin.Forms.Xaml.dll + + ..\packages\Zeroconf.3.5.11\lib\netstandard2.0\Zeroconf.dll + + + ..\packages\TcpSharp.1.3.6\lib\netstandard2.1\TcpSharp.dll + diff --git a/iOS/Main.cs b/iOS/Main.cs index 6bda8c9..516266e 100644 --- a/iOS/Main.cs +++ b/iOS/Main.cs @@ -1,15 +1,13 @@ using UIKit; +using System; namespace qController.iOS { public class Application { - // This is the main entry point of the application. static void Main(string[] args) { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, "AppDelegate"); + UIApplication.Main(args, null, typeof(AppDelegate)); } } } diff --git a/iOS/packages.config b/iOS/packages.config index 6c522e5..0c86570 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -79,9 +79,10 @@ + - + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 4a7769a..a89868e 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -102,9 +102,6 @@ - - ..\packages\Zeroconf.3.6.11\lib\xamarinios10\Zeroconf.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll @@ -166,6 +163,12 @@ ..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll + + ..\packages\Zeroconf.3.5.11\lib\xamarinios10\Zeroconf.dll + + + ..\packages\TcpSharp.1.3.6\lib\netstandard2.1\TcpSharp.dll + diff --git a/qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs b/qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs index 19594c7..2f20180 100644 --- a/qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs +++ b/qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using Serilog; -using TcpSharp.Events; +using TcpSharp; namespace SharpOSC { @@ -35,7 +34,7 @@ namespace SharpOSC string _address; - TcpSharp.TcpSharpSocketClient tcpClient; + TcpSharpSocketClient tcpClient; private List frameStream = new List(); @@ -50,7 +49,7 @@ namespace SharpOSC try { - tcpClient = new TcpSharp.TcpSharpSocketClient(Address, Port); + tcpClient = new TcpSharpSocketClient(Address, Port); tcpClient.OnConnected += ClientConnected; tcpClient.OnDataReceived += DataReceived; tcpClient.OnDisconnected += ClientDisconneted; diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index aa51791..9698400 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -63,13 +63,13 @@ - - + +