jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-07-26 10:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix dependcy versions: iOS building

Browse Source
This commit is contained in:
Joel Wetzell
2024-04-16 17:17:22 -05:00
parent f85dc8effc
commit 54de266a6c
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/packages.config
+2 -2
View File
@@ -81,7 +81,7 @@
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="monoandroid90" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid90" />
<package id="TcpSharp" version="1.2.0" targetFramework="monoandroid13.0" />
<package id="TcpSharp" version="1.3.6" targetFramework="monoandroid13.0" />
<package id="Xamarin.AndroidX.Activity" version="1.8.1" targetFramework="monoandroid13.0" />
<package id="Xamarin.AndroidX.Activity.Ktx" version="1.8.1" targetFramework="monoandroid13.0" />
<package id="Xamarin.AndroidX.Annotation" version="1.7.0.2" targetFramework="monoandroid13.0" />
@@ -176,5 +176,5 @@
<package id="Xamarin.Kotlin.StdLib.Jdk8" version="1.9.20" targetFramework="monoandroid13.0" />
<package id="Xamarin.KotlinX.Coroutines.Android" version="1.7.3.2" targetFramework="monoandroid13.0" />
<package id="Xamarin.KotlinX.Coroutines.Core.Jvm" version="1.7.3.2" targetFramework="monoandroid13.0" />
<package id="Zeroconf" version="3.6.11" targetFramework="monoandroid13.0" />
<package id="Zeroconf" version="3.5.11" targetFramework="monoandroid13.0" />
</packages>
Droid/qController.Droid.csproj
+6 -6
View File
@@ -141,9 +141,6 @@
<Reference Include="Serilog.Sinks.Xamarin">
<HintPath>..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\monoandroid90\Serilog.Sinks.Xamarin.dll</HintPath>
</Reference>
<Reference Include="TcpSharp, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\TcpSharp.1.2.0\lib\netstandard2.1\TcpSharp.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Activity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.AndroidX.Activity.1.8.1\lib\monoandroid12.0\Xamarin.AndroidX.Activity.dll</HintPath>
</Reference>
@@ -419,9 +416,6 @@
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
</Reference>
<Reference Include="Zeroconf, Version=3.6.0.0, Culture=neutral, PublicKeyToken=dbbfcdb374507df0, processorArchitecture=MSIL">
<HintPath>..\packages\Zeroconf.3.6.11\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Browser">
<HintPath>..\packages\Xamarin.AndroidX.Browser.1.5.0.3\lib\monoandroid12.0\Xamarin.AndroidX.Browser.dll</HintPath>
</Reference>
@@ -449,6 +443,12 @@
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2622\lib\MonoAndroid13.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.5.11\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="TcpSharp">
<HintPath>..\packages\TcpSharp.1.3.6\lib\netstandard2.1\TcpSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
iOS/Main.cs
+2 -4
View File
@@ -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));
}
}
}
iOS/packages.config
+2 -1
View File
@@ -79,9 +79,10 @@
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="xamarinios10" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="TcpSharp" version="1.3.6" targetFramework="xamarinios10" />
<package id="Xamarin.Build.Download" version="0.11.4" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.8.0" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.2622" targetFramework="xamarinios10" />
<package id="Xamarin.iOS.MaterialComponents" version="92.0.0" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.6.11" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.5.11" targetFramework="xamarinios10" />
</packages>
iOS/qController.iOS.csproj
+6 -3
View File
@@ -102,9 +102,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.IO.Compression" />
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.6.11\lib\xamarinios10\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -166,6 +163,12 @@
<Reference Include="System.Diagnostics.DiagnosticSource">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.5.11\lib\xamarinios10\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="TcpSharp">
<HintPath>..\packages\TcpSharp.1.3.6\lib\netstandard2.1\TcpSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs
+3 -4
View File
@@ -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<byte> frameStream = new List<byte>();
@@ -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;
qController.Standard/qController.csproj
+2 -2
View File
@@ -63,13 +63,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.562" />
<PackageReference Include="TcpSharp" Version="1.2.0" />
<PackageReference Include="Zeroconf" Version="3.6.11" />
<PackageReference Include="TcpSharp" Version="1.3.6" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Zeroconf" Version="3.5.11" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />