Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Update to multitarget net6.0-android as well #1277

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to multitarget net6.0-android as well #1277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Android/SurfaceDuo/source/SurfaceDuo/SurfaceDuo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid90</TargetFrameworks>
<TargetFrameworks>MonoAndroid9.0;net6.0-android</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<AssemblyName>Xamarin.DuoSdk</AssemblyName>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidUseIntermediateDesignerFile>False</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<RootNamespace>Xamarin.DuoSdk</RootNamespace>
<AndroidClassParser>class-parse</AndroidClassParser>
<AndroidFragmentType>AndroidX.Fragment.App.Fragment</AndroidFragmentType>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
</PropertyGroup>

Expand All @@ -24,7 +25,7 @@
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2115916</PackageProjectUrl>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageVersion>0.0.3.3</PackageVersion>
<PackageVersion>0.0.4.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -34,11 +35,7 @@

<ItemGroup>
<EmbeddedJar Include="Jars\com.microsoft.device.display.displaymask.jar" Link="com.microsoft.device.display.displaymask.jar" />
<None Include="..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
</ItemGroup>

<ItemGroup>
<Reference Include="Mono.Android" />
<None Include="..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
</ItemGroup>

</Project>