jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-09-01 12:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update packages

Browse Source
This commit is contained in:
Joel Wetzell
2022-11-08 09:48:01 -06:00
parent dc864f2341
commit 6bd64235d2
7 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Resources/Resource.designer.cs
Generated
+2 -1
View File
@@ -2,6 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // 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 public partial class Resource
{ {
Droid/packages.config
+6 -5
View File
@@ -2,17 +2,18 @@
<packages> <packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="monoandroid10.0" /> <package id="Acr.Settings" version="9.0.1" targetFramework="monoandroid10.0" />
<package id="Acr.UserDialogs" version="7.2.0.562" targetFramework="monoandroid10.0" /> <package id="Acr.UserDialogs" version="7.2.0.562" targetFramework="monoandroid10.0" />
<package id="AndHUD" version="1.4.3" targetFramework="monoandroid10.0" /> <package id="AndHUD" version="1.5.0" targetFramework="monoandroid12.0" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="monoandroid90" /> <package id="Microsoft.CSharp" version="4.7.0" targetFramework="monoandroid90" />
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="monoandroid10.0" /> <package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="monoandroid10.0" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" /> <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" /> <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid10.0" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid10.0" />
<package id="Serilog" version="2.10.0" targetFramework="monoandroid90" /> <package id="Serilog" version="2.12.0" targetFramework="monoandroid12.0" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" /> <package id="Serilog.Sinks.Xamarin" version="1.0.0" targetFramework="monoandroid12.0" />
<package id="Splat" version="14.1.17" targetFramework="monoandroid10.0" /> <package id="Splat" version="14.1.17" targetFramework="monoandroid10.0" />
<package id="Square.OkHttp3" version="4.9.2.1" targetFramework="monoandroid10.0" /> <package id="Square.OkHttp3" version="4.9.2.1" targetFramework="monoandroid10.0" />
<package id="Square.OkIO" version="2.10.0.1" targetFramework="monoandroid10.0" /> <package id="Square.OkIO" version="2.10.0.1" targetFramework="monoandroid10.0" />
<package id="SuperSimpleTcp" version="3.0.5" targetFramework="monoandroid12.0" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
@@ -176,10 +177,10 @@
<package id="Xamarin.AndroidX.ViewPager" version="1.0.0.10" targetFramework="monoandroid10.0" /> <package id="Xamarin.AndroidX.ViewPager" version="1.0.0.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.12" targetFramework="monoandroid10.0" /> <package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.12" targetFramework="monoandroid10.0" />
<package id="Xamarin.Build.Download" version="0.11.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Essentials" version="1.7.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.Essentials" version="1.7.3" targetFramework="monoandroid12.0" />
<package id="Xamarin.Firebase.Encoders" version="117.0.0.3" targetFramework="monoandroid10.0" /> <package id="Xamarin.Firebase.Encoders" version="117.0.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Firebase.Encoders.JSON" version="118.0.0.3" targetFramework="monoandroid10.0" /> <package id="Xamarin.Firebase.Encoders.JSON" version="118.0.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Forms" version="5.0.0.2291" targetFramework="monoandroid10.0" /> <package id="Xamarin.Forms" version="5.0.0.2515" targetFramework="monoandroid12.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportApi" version="3.0.0.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportApi" version="3.0.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="3.0.0.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="3.0.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="3.0.1.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="3.0.1.1" targetFramework="monoandroid10.0" />
Droid/qController.Droid.csproj
+16 -12
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props')" /> <Import Project="..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" /> <Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
<Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props')" /> <Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
<PropertyGroup> <PropertyGroup>
@@ -11,7 +11,7 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>qController.Droid</RootNamespace> <RootNamespace>qController.Droid</RootNamespace>
<AssemblyName>qController.Droid</AssemblyName> <AssemblyName>qController.Droid</AssemblyName>
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion> <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication> <AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass> <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -33,6 +33,7 @@
</MandroidI18n> </MandroidI18n>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex> <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType> <DebugType></DebugType>
@@ -70,16 +71,16 @@
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
<Reference Include="AndHUD"> <Reference Include="AndHUD">
<HintPath>..\packages\AndHUD.1.4.3\lib\monoandroid81\AndHUD.dll</HintPath> <HintPath>..\packages\AndHUD.1.5.0\lib\monoandroid12.0\AndHUD.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="Serilog"> <Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll</HintPath> <HintPath>..\packages\Serilog.2.12.0\lib\netstandard2.1\Serilog.dll</HintPath>
</Reference> </Reference>
<Reference Include="Serilog.Sinks.Xamarin"> <Reference Include="Serilog.Sinks.Xamarin">
<HintPath>..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\MonoAndroid403\Serilog.Sinks.Xamarin.dll</HintPath> <HintPath>..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\monoandroid90\Serilog.Sinks.Xamarin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Splat"> <Reference Include="Splat">
<HintPath>..\packages\Splat.14.1.17\lib\netstandard2.0\Splat.dll</HintPath> <HintPath>..\packages\Splat.14.1.17\lib\netstandard2.0\Splat.dll</HintPath>
@@ -352,22 +353,22 @@
<HintPath>..\packages\Xamarin.AndroidX.Browser.1.3.0.8\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath> <HintPath>..\packages\Xamarin.AndroidX.Browser.1.3.0.8\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
</Reference> </Reference>
<Reference Include="FormsViewGroup"> <Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Core"> <Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform.Android"> <Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform"> <Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Xaml"> <Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Essentials"> <Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.7.0\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath> <HintPath>..\packages\Xamarin.Essentials.1.7.3\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs"> <Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath> <HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
@@ -466,6 +467,9 @@
<Reference Include="Xamarin.AndroidX.Concurrent.Futures"> <Reference Include="Xamarin.AndroidX.Concurrent.Futures">
<HintPath>..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.5\lib\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.dll</HintPath> <HintPath>..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.5\lib\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.dll</HintPath>
</Reference> </Reference>
<Reference Include="SuperSimpleTcp">
<HintPath>..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MainActivity.cs" /> <Compile Include="MainActivity.cs" />
@@ -603,8 +607,8 @@
<Import Project="..\packages\Xamarin.AndroidX.Core.1.6.0.3\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.1.6.0.3\build\monoandroid90\Xamarin.AndroidX.Core.targets')" /> <Import Project="..\packages\Xamarin.AndroidX.Core.1.6.0.3\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.1.6.0.3\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Activity.1.3.1.2\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Activity.1.3.1.2\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" /> <Import Project="..\packages\Xamarin.AndroidX.Activity.1.3.1.2\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Activity.1.3.1.2\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets')" /> <Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.1.2\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets')" /> <Import Project="..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets')" /> <Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets')" /> <Import Project="..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" />
</Project> </Project>
iOS/AppDelegate.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace qController.iOS
public override bool FinishedLaunching(UIApplication app, NSDictionary options) public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{ {
global::Xamarin.Forms.Forms.Init(); 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()); LoadApplication(new App());
iOS/packages.config
+6 -5
View File
@@ -2,14 +2,15 @@
<packages> <packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="xamarinios10" /> <package id="Acr.Settings" version="9.0.1" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="7.2.0.562" targetFramework="xamarinios10" /> <package id="Acr.UserDialogs" version="7.2.0.562" targetFramework="xamarinios10" />
<package id="BTProgressHUD" version="1.3.5" targetFramework="xamarinios10" /> <package id="BTProgressHUD" version="1.5.0" targetFramework="xamarinios10" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="xamarinios10" /> <package id="Microsoft.CSharp" version="4.7.0" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="xamarinios10" /> <package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="xamarinios10" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" /> <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" /> <package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
<package id="Serilog" version="2.10.0" targetFramework="xamarinios10" /> <package id="Serilog" version="2.12.0" targetFramework="xamarinios10" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="xamarinios10" /> <package id="Serilog.Sinks.Xamarin" version="1.0.0" targetFramework="xamarinios10" />
<package id="SuperSimpleTcp" version="3.0.5" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
@@ -76,8 +77,8 @@
<package id="System.Xml.XDocument" version="4.3.0" 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="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" /> <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.7.1" targetFramework="xamarinios10" /> <package id="Xamarin.Essentials" version="1.7.3" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.2337" targetFramework="xamarinios10" /> <package id="Xamarin.Forms" version="5.0.0.2515" targetFramework="xamarinios10" />
<package id="Xamarin.iOS.MaterialComponents" version="92.0.0" targetFramework="xamarinios10" /> <package id="Xamarin.iOS.MaterialComponents" version="92.0.0" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.5.11" targetFramework="xamarinios10" /> <package id="Zeroconf" version="3.5.11" targetFramework="xamarinios10" />
</packages> </packages>
iOS/qController.iOS.csproj
+15 -10
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.5.0.0.2337\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2337\build\Xamarin.Forms.props')" /> <Import Project="..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" /> <Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -91,7 +91,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
<Reference Include="BTProgressHUD"> <Reference Include="BTProgressHUD">
<HintPath>..\packages\BTProgressHUD.1.3.5\lib\xamarinios10\BTProgressHUD.dll</HintPath> <HintPath>..\packages\BTProgressHUD.1.5.0\lib\xamarinios10\BTProgressHUD.dll</HintPath>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs"> <Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\xamarinios10\Acr.UserDialogs.dll</HintPath> <HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\xamarinios10\Acr.UserDialogs.dll</HintPath>
@@ -126,31 +126,36 @@
<HintPath>..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath> <HintPath>..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Core"> <Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform"> <Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Xaml"> <Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Essentials"> <Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.7.1\lib\xamarinios10\Xamarin.Essentials.dll</HintPath> <HintPath>..\packages\Xamarin.Essentials.1.7.3\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference> </Reference>
<Reference Include="Serilog"> <Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll</HintPath> <HintPath>..\packages\Serilog.2.12.0\lib\netstandard2.1\Serilog.dll</HintPath>
</Reference> </Reference>
<Reference Include="Serilog.Sinks.Xamarin"> <Reference Include="Serilog.Sinks.Xamarin">
<HintPath>..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\Xamarin.iOS10\Serilog.Sinks.Xamarin.dll</HintPath> <HintPath>..\packages\Serilog.Sinks.Xamarin.1.0.0\lib\xamarinios10\Serilog.Sinks.Xamarin.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Drawing.Common.dll" /> <Reference Include="System.Drawing.Common.dll" />
<Reference Include="MaterialComponents"> <Reference Include="MaterialComponents">
<HintPath>..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll</HintPath> <HintPath>..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform.iOS"> <Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath> <HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="SuperSimpleTcp">
<HintPath>..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.Numerics.Vectors" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json"> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
@@ -232,5 +237,5 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" /> <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" /> <Import Project="..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2337\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2337\build\Xamarin.Forms.targets')" /> <Import Project="..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" />
</Project> </Project>
qController.Standard/qController.csproj
+5 -3
View File
@@ -64,11 +64,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.562" /> <PackageReference Include="Acr.UserDialogs" Version="7.2.0.562" />
<PackageReference Include="Zeroconf" Version="3.5.11" /> <PackageReference Include="Zeroconf" Version="3.5.11" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Acr.Settings" Version="9.0.1" /> <PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Serilog" Version="2.10.0" /> <PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="SuperSimpleTcp" Version="3.0.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="App.xaml" /> <None Remove="App.xaml" />
@@ -81,6 +82,7 @@
<None Remove="Bespoke.Osc\Samples\VB\Receiver\My Project\Application.myapp" /> <None Remove="Bespoke.Osc\Samples\VB\Receiver\My Project\Application.myapp" />
<None Remove="Bespoke.Net\.gitignore" /> <None Remove="Bespoke.Net\.gitignore" />
<None Remove="Bespoke.Net\Help\Bespoke Common Library.chm" /> <None Remove="Bespoke.Net\Help\Bespoke Common Library.chm" />
<None Remove="SuperSimpleTcp" />
</ItemGroup> </ItemGroup>
<!--<ItemGroup> <!--<ItemGroup>
<EmbeddedResource Include="Pages\ControlPage.xaml"> <EmbeddedResource Include="Pages\ControlPage.xaml">