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

update to .NET 9.0 and Android SDK 35

Browse Source
This commit is contained in:
Joel Wetzell
2025-11-01 12:58:07 -05:00
parent 2cadc4df93
commit 0a3f464d81
7 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController/Pages/App.xaml.cs
+1
View File
@@ -1,5 +1,6 @@
using Acr.UserDialogs;
using qController.Communication;
using Microsoft.Maui.Devices;
namespace qController
{
qController/Pages/ControlPage.xaml.cs
+1
View File
@@ -6,6 +6,7 @@ using qController.Communication;
using Microsoft.Maui.Layouts;
using Acr.UserDialogs;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Maui.Graphics;
namespace qController
{
qController/Pages/qConnectionPage.xaml.cs
+1
View File
@@ -4,6 +4,7 @@ using qController.QItems;
using qController.Dialogs;
using qController.Cell;
using Acr.UserDialogs;
using Microsoft.Maui.ApplicationModel;
namespace qController
{
qController/Platforms/Android/MainActivity.cs
+1
View File
@@ -2,6 +2,7 @@
using Android.Content.PM;
using Android.OS;
using Serilog;
using Microsoft.Maui;
namespace qController
{
qController/Resources/Styles/Colors.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<?xaml-comp compile="true" ?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
qController/Resources/Styles/Styles.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<?xaml-comp compile="true" ?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
qController/qController.csproj
+49 -64
View File
@@ -1,76 +1,62 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android34.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>qController</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- Display name -->
<ApplicationTitle>qControl</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.jwetzell.qlabcontroller</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<WindowsPackageType>None</WindowsPackageType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android34.0|AnyCPU'">
<AndroidLinkTool>r8</AndroidLinkTool>
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<AndroidPackageFormat>apk</AndroidPackageFormat>
<AndroidUseAapt2>True</AndroidUseAapt2>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<PropertyGroup>
<TargetFrameworks>net9.0-android35.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>qController</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- Display name -->
<ApplicationTitle>qControl</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.jwetzell.qlabcontroller</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<WindowsPackageType>None</WindowsPackageType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
<AndroidLinkTool>r8</AndroidLinkTool>
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<AndroidPackageFormat>apk</AndroidPackageFormat>
<AndroidUseAapt2>True</AndroidUseAapt2>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android35.0|AnyCPU'">
<AndroidPackageFormat>apk</AndroidPackageFormat>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" ForegroundScale="0.65" />
<!-- Splash Screen -->
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#71AEFF" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs.Maui" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
</ItemGroup>
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs.Maui" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Serilog" Version="4.2.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Zeroconf" Version="3.5.11" />
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Pages\App.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -88,5 +74,4 @@
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
</Project>
</Project>