jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-08 08:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump android to 1.6.6 (36)

Browse Source
This commit is contained in:
Joel Wetzell
2024-06-25 07:55:28 -05:00
parent 19796ca3b3
commit 078f39f4be
5 changed files with 5779 additions and 5382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Properties/AndroidManifest.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="35" android:versionName="1.6.5" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="36" android:versionName="1.6.6" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
Droid/Resources/Resource.designer.cs
Generated
+5770 -5366
View File
File diff suppressed because it is too large Load Diff
Droid/packages.config
+3
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="monoandroid13.0" />
<package id="Acr.Support" version="2.1.0" targetFramework="monoandroid13.0" />
<package id="Acr.UserDialogs" version="7.2.0.562" targetFramework="monoandroid13.0" />
<package id="AndHUD" version="1.5.0" targetFramework="monoandroid13.0" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="monoandroid90" />
@@ -165,7 +166,9 @@
<package id="Xamarin.Google.Dagger" version="2.48.1" targetFramework="monoandroid13.0" />
<package id="Xamarin.Google.ErrorProne.Annotations" version="2.23.0" targetFramework="monoandroid13.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.16" targetFramework="monoandroid13.0" />
<package id="Xamarin.GooglePlayServices.Base" version="118.2.0.4" targetFramework="monoandroid13.0" />
<package id="Xamarin.GooglePlayServices.Basement" version="118.2.0.4" targetFramework="monoandroid13.0" />
<package id="Xamarin.GooglePlayServices.Maps" version="118.1.0.5" targetFramework="monoandroid13.0" />
<package id="Xamarin.GooglePlayServices.Stats" version="117.0.3.7" targetFramework="monoandroid13.0" />
<package id="Xamarin.GooglePlayServices.Tasks" version="118.0.2.5" targetFramework="monoandroid13.0" />
<package id="Xamarin.JavaX.Inject" version="1.0.0.10" targetFramework="monoandroid13.0" />
Droid/qController.Droid.csproj
+5 -14
View File
@@ -56,10 +56,6 @@
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidKeyStore>
</AndroidKeyStore>
<AndroidSigningKeyStore>
</AndroidSigningKeyStore>
<AndroidSigningStorePass>
</AndroidSigningStorePass>
<AndroidSigningKeyAlias>
@@ -84,9 +80,6 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="QControlKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\QControlKit.0.0.32\lib\netstandard2.1\QControlKit.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.3.1.1\lib\netstandard2.1\Serilog.dll</HintPath>
</Reference>
@@ -405,13 +398,10 @@
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Xamarin.GooglePlayServices.Base">
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.117.6.0.3\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.118.2.0.4\lib\monoandroid12.0\Xamarin.GooglePlayServices.Base.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Maps">
<HintPath>..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll</HintPath>
</Reference>
<Reference Include="SuperSimpleTcp">
<HintPath>..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
<HintPath>..\packages\Xamarin.GooglePlayServices.Maps.118.1.0.5\lib\monoandroid12.0\Xamarin.GooglePlayServices.Maps.dll</HintPath>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
@@ -646,7 +636,6 @@
<Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.9.20\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.Common.1.9.20\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.Jetbrains.Annotations.24.1.0\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Jetbrains.Annotations.24.1.0\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.AndroidX.Preference.1.2.1.2\build\monoandroid12.0\Xamarin.AndroidX.Preference.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Preference.1.2.1.2\build\monoandroid12.0\Xamarin.AndroidX.Preference.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.AndroidX.Window.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.Window.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Window.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.Window.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.AndroidX.RecyclerView.1.3.2\build\monoandroid12.0\Xamarin.AndroidX.RecyclerView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.RecyclerView.1.3.2\build\monoandroid12.0\Xamarin.AndroidX.RecyclerView.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.21\build\monoandroid12.0\Xamarin.AndroidX.Legacy.Support.V4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.21\build\monoandroid12.0\Xamarin.AndroidX.Legacy.Support.V4.targets'))" />
@@ -728,7 +717,6 @@
<Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.9.20\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.9.20\build\monoandroid12.0\Xamarin.Kotlin.StdLib.Common.targets')" />
<Import Project="..\packages\Xamarin.Jetbrains.Annotations.24.1.0\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.24.1.0\build\monoandroid12.0\Xamarin.Jetbrains.Annotations.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Preference.1.2.1.2\build\monoandroid12.0\Xamarin.AndroidX.Preference.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Preference.1.2.1.2\build\monoandroid12.0\Xamarin.AndroidX.Preference.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Window.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.Window.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Window.1.2.0\build\monoandroid12.0\Xamarin.AndroidX.Window.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.RecyclerView.1.3.2\build\monoandroid12.0\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.RecyclerView.1.3.2\build\monoandroid12.0\Xamarin.AndroidX.RecyclerView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.21\build\monoandroid12.0\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.21\build\monoandroid12.0\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
@@ -737,4 +725,7 @@
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Navigation.UI.2.3.5.1\build\monoandroid90\Xamarin.AndroidX.Navigation.UI.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Navigation.UI.2.3.5.1\build\monoandroid90\Xamarin.AndroidX.Navigation.UI.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2622\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2622\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Base.118.2.0.4\build\monoandroid12.0\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.118.2.0.4\build\monoandroid12.0\Xamarin.GooglePlayServices.Base.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.3.7\build\monoandroid12.0\Xamarin.GooglePlayServices.Stats.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Maps.118.1.0.5\build\monoandroid12.0\Xamarin.GooglePlayServices.Maps.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Maps.118.1.0.5\build\monoandroid12.0\Xamarin.GooglePlayServices.Maps.targets')" />
</Project>
qController.Standard/qController.csproj
-1
View File
@@ -82,7 +82,6 @@
<None Remove="Bespoke.Osc\Samples\VB\Receiver\My Project\Application.myapp" />
<None Remove="Bespoke.Net\.gitignore" />
<None Remove="Bespoke.Net\Help\Bespoke Common Library.chm" />
<None Remove="SuperSimpleTcp" />
</ItemGroup>
<!--<ItemGroup>
<EmbeddedResource Include="Pages\ControlPage.xaml">