Skip to content

Commit bf52747

Browse files
authored
Merge pull request #40 from aitchDashGee/feature/net6.0
Update project to .NET 6 for Android
2 parents fb7270e + 2e71e4a commit bf52747

9 files changed

Lines changed: 30 additions & 479 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<application android:allowBackup="False" android:label="UsbSerialExampleApp" android:supportsRtl="true"></application>
3+
<uses-permission android:name="android.permission.INTERNET" />
4+
</manifest>

UsbSerialExampleApp/Properties/AndroidManifest.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

UsbSerialExampleApp/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

UsbSerialExampleApp/Resources/Resource.Designer.cs

Lines changed: 0 additions & 169 deletions
This file was deleted.
Lines changed: 16 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{59C7DFF3-4E5E-42D7-BB77-E6C4F4E74512}</ProjectGuid>
9-
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>UsbSerialExampleApp</RootNamespace>
3+
<TargetFramework>net7.0-android</TargetFramework>
4+
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
5+
<OutputType>Exe</OutputType>
6+
<Nullable>disable</Nullable>
7+
<ImplicitUsings>disable</ImplicitUsings>
8+
<ApplicationId>UsbSerialExampleApp.UsbSerialExampleApp</ApplicationId>
9+
<ApplicationVersion>1</ApplicationVersion>
10+
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1311
<AssemblyName>UsbSerialExampleApp</AssemblyName>
14-
<FileAlignment>512</FileAlignment>
15-
<AndroidApplication>true</AndroidApplication>
16-
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
17-
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
18-
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
20-
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
21-
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<DebugSymbols>true</DebugSymbols>
24-
<DebugType>full</DebugType>
25-
<Optimize>false</Optimize>
26-
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>DEBUG;TRACE</DefineConstants>
28-
<ErrorReport>prompt</ErrorReport>
29-
<WarningLevel>4</WarningLevel>
30-
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
31-
<AndroidLinkMode>None</AndroidLinkMode>
12+
<RootNamespace>UsbSerialExampleApp</RootNamespace>
3213
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34-
<DebugType>pdbonly</DebugType>
35-
<DebugSymbols>true</DebugSymbols>
36-
<AndroidManagedSymbols>true</AndroidManagedSymbols>
37-
<Optimize>true</Optimize>
38-
<OutputPath>bin\Release\</OutputPath>
39-
<DefineConstants>TRACE</DefineConstants>
40-
<ErrorReport>prompt</ErrorReport>
41-
<WarningLevel>4</WarningLevel>
42-
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
43-
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
15+
<AndroidLinkTool>r8</AndroidLinkTool>
16+
<AndroidPackageFormat>apk</AndroidPackageFormat>
4417
</PropertyGroup>
18+
<ItemGroup />
4519
<ItemGroup>
46-
<Reference Include="Mono.Android" />
47-
<Reference Include="Mono.Android.Export" />
48-
<Reference Include="mscorlib" />
49-
<Reference Include="System" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.Xml.Linq" />
52-
<Reference Include="System.Xml" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<Compile Include="MainActivity.cs" />
56-
<Compile Include="Resources\Resource.Designer.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
<Compile Include="SerialConsoleActivity.cs" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<None Include="GettingStarted.Xamarin" />
62-
<None Include="Resources\AboutResources.txt" />
63-
<None Include="Assets\AboutAssets.txt" />
64-
<AndroidResource Include="Resources\layout\serial_console.axml">
65-
<SubType>Designer</SubType>
66-
</AndroidResource>
67-
</ItemGroup>
68-
<ItemGroup>
69-
<AndroidResource Include="Resources\layout\Main.axml">
70-
<SubType>Designer</SubType>
71-
</AndroidResource>
72-
</ItemGroup>
73-
<ItemGroup>
74-
<AndroidResource Include="Resources\values\Strings.xml" />
75-
</ItemGroup>
76-
<ItemGroup>
77-
<AndroidResource Include="Resources\drawable\Icon.png" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<None Include="Properties\AndroidManifest.xml" />
81-
</ItemGroup>
82-
<ItemGroup>
83-
<ProjectReference Include="..\UsbSerialForAndroid\UsbSerialForAndroid.csproj">
84-
<Project>{a64567bc-548a-4cb7-9f2c-ece75ee1a868}</Project>
85-
<Name>UsbSerialForAndroid</Name>
86-
</ProjectReference>
87-
</ItemGroup>
88-
<ItemGroup>
89-
<AndroidResource Include="Resources\xml\device_filter.xml" />
20+
<ProjectReference Include="..\UsbSerialForAndroid\UsbSerialForAndroid.csproj" />
9021
</ItemGroup>
91-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
92-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
93-
Other similar extension points exist, see Microsoft.Common.targets.
94-
<Target Name="BeforeBuild">
95-
</Target>
96-
<Target Name="AfterBuild">
97-
</Target>
98-
-->
22+
<ItemGroup />
9923
</Project>

UsbSerialForAndroid/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)