diff --git a/App/RobobinApp/RobobinApp.csproj b/App/RobobinApp/RobobinApp.csproj index f75d124c777b8e9b7976b1f1e97aa83a8b55b205..aee94946c230f6f365a034a450d090dff4a35669 100644 --- a/App/RobobinApp/RobobinApp.csproj +++ b/App/RobobinApp/RobobinApp.csproj @@ -1,96 +1,99 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - - <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks> - <OutputType>Exe</OutputType> + <PropertyGroup> + <TargetFrameworks>net8.0-android</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks> + <OutputType>Exe</OutputType> <RootNamespace>Robobin</RootNamespace> - <UseMaui>true</UseMaui> - <SingleProject>true</SingleProject> - <ImplicitUsings>enable</ImplicitUsings> - <Nullable>enable</Nullable> - <ApplicationTitle>Robobin</ApplicationTitle> - <ApplicationId>com.companyname.robobin</ApplicationId> - <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> - <ApplicationVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">1</ApplicationVersion> - <WindowsPackageType>None</WindowsPackageType> + <UseMaui>true</UseMaui> + <SingleProject>true</SingleProject> + <ImplicitUsings>enable</ImplicitUsings> + <Nullable>enable</Nullable> + <ApplicationTitle>Robobin</ApplicationTitle> + <ApplicationId>com.companyname.robobin</ApplicationId> + <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> + <ApplicationVersion>1</ApplicationVersion> + <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion> - <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion> - <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> - <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> - <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> - </PropertyGroup> + <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion> + <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> + <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> + <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'"> + <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> + </PropertyGroup> - <ItemGroup> - <MauiIcon Include="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> - <MauiIcon Include="Resources\AppIcon\robobinlogo.png" /> - <MauiImage Include="Resources\Images\*" /> - <MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" /> - <MauiFont Include="Resources\Fonts\*" /> - <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> - <MauiSplashScreen Include="Platforms\Android\Resources\drawable\bin.svg"> - <Color>#512BD4</Color> - <BaseSize>128,128</BaseSize> - </MauiSplashScreen> + <ItemGroup> + <MauiIcon Include="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> + <MauiIcon Include="Resources\AppIcon\robobinlogo.png" /> + <MauiImage Include="Resources\Images\*" /> + <MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" /> + <MauiFont Include="Resources\Fonts\*" /> + <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> + <MauiSplashScreen Include="Platforms\Android\Resources\drawable\bin.svg"> + <Color>#512BD4</Color> + <BaseSize>128,128</BaseSize> + </MauiSplashScreen> <MauiSplashScreen Include="Resources\Splash\bin.svg" Color="#8185b4" BaseSize="128,128" /> - </ItemGroup> + </ItemGroup> - <ItemGroup> - <AndroidResource Remove="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> - </ItemGroup> + <ItemGroup> + <AndroidResource Remove="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> + </ItemGroup> - <ItemGroup> - <None Remove="Platforms\Android\Resources\drawable\bin.svg" /> - <None Remove="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> - </ItemGroup> + <ItemGroup> + <None Remove="Platforms\Android\Resources\drawable\bin.svg" /> + <None Remove="Platforms\Android\Resources\mipmap\robobinlogo1.png" /> + </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" /> - <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" /> - <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" /> - <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" /> - <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.91" /> - <PackageReference Include="Microsoft.Maui.Resizetizer" Version="8.0.91" /> - <PackageReference Include="Plugin.BLE" Version="3.1.0" /> - <PackageReference Include="Shiny" Version="2.7.3" /> - <PackageReference Include="Shiny.BluetoothLE" Version="3.3.3" /> - <PackageReference Include="Shiny.Hosting.Maui" Version="3.3.3" /> - <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" /> - <PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.8" /> - </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" /> + <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" /> + <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" /> + <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" /> + <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.91" /> + <PackageReference Include="Microsoft.Maui.Resizetizer" Version="8.0.91" /> + <PackageReference Include="Plugin.BLE" Version="3.1.0" /> + <PackageReference Include="Shiny" Version="2.7.3" /> + <PackageReference Include="Shiny.BluetoothLE" Version="3.3.3" /> + <PackageReference Include="Shiny.Hosting.Maui" Version="3.3.3" /> + <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" /> + <PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.8" /> + </ItemGroup> - <ItemGroup> - <Compile Update="LeftBox.xaml.cs"> - <DependentUpon>LeftBox.xaml</DependentUpon> - </Compile> - <Compile Update="Views\ConnectionPage.xaml.cs"> - <DependentUpon>ConnectionPage.xaml</DependentUpon> - </Compile> - <Compile Update="Views\MainPage_Android.xaml.cs"> - <DependentUpon>MainPage_Android.xaml</DependentUpon> - </Compile> - <Compile Update="Views\Sides\AdminBox.xaml.cs"> - <DependentUpon>AdminBox.xaml</DependentUpon> - </Compile> - </ItemGroup> + <ItemGroup> + <Compile Update="LeftBox.xaml.cs"> + <DependentUpon>LeftBox.xaml</DependentUpon> + </Compile> + <Compile Update="Views\ConnectionPage.xaml.cs"> + <DependentUpon>ConnectionPage.xaml</DependentUpon> + </Compile> + <Compile Update="Views\MainPage_Android.xaml.cs"> + <DependentUpon>MainPage_Android.xaml</DependentUpon> + </Compile> + <Compile Update="Views\Sides\AdminBox.xaml.cs"> + <DependentUpon>AdminBox.xaml</DependentUpon> + </Compile> + </ItemGroup> - <ItemGroup> - <MauiXaml Update="LeftBox.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - <MauiXaml Update="Views\CentreGraph.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - <MauiXaml Update="Views\ConnectionPage.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - <MauiXaml Update="Views\MainPage_Android.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - <MauiXaml Update="Views\Sides\AdminBox.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - <MauiXaml Update="Views\Sides\SideBox.xaml"> - <Generator>MSBuild:Compile</Generator> - </MauiXaml> - </ItemGroup> + <ItemGroup> + <MauiXaml Update="LeftBox.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + <MauiXaml Update="Views\CentreGraph.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + <MauiXaml Update="Views\ConnectionPage.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + <MauiXaml Update="Views\MainPage_Android.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + <MauiXaml Update="Views\Sides\AdminBox.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + <MauiXaml Update="Views\Sides\SideBox.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> + </ItemGroup> </Project>