Skip to content

Commit d01a1a7

Browse files
committed
[build] Add 'net6.0-android30.0' TargetFramework.
1 parent da540db commit d01a1a7

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,8 +1222,8 @@
12221222
{
12231223
"groupId": "org.reactivestreams",
12241224
"artifactId": "reactive-streams",
1225-
"version": "1.0.0",
1226-
"nugetVersion": "1.0.3",
1225+
"version": "1.5.0",
1226+
"nugetVersion": "1.5.0",
12271227
"nugetId": "Xamarin.KotlinX.Coroutines.Android",
12281228
"dependencyOnly": true
12291229
}

source/AndroidXProject.cshtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@using System.Linq
33
<Project Sdk="Xamarin.Legacy.Sdk">
44
<PropertyGroup>
5-
<TargetFramework>MonoAndroid9.0</TargetFramework>
5+
<TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
66
<IsBindingProject>true</IsBindingProject>
77
@if (!string.IsNullOrEmpty(Model.AssemblyName)) {
88
<AssemblyName>@(Model.AssemblyName)</AssemblyName>
@@ -93,8 +93,10 @@
9393
</ItemGroup>
9494

9595
<ItemGroup>
96-
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\$(TargetFramework)" />
97-
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\$(TargetFramework)" />
96+
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\monoandroid90" />
97+
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\net6.0-android30.0" />
98+
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\monoandroid90" />
99+
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\net6.0-android30.0" />
98100
<None Include="..\..\LICENSE.md" Pack="True" PackagePath="LICENSE.md" />
99101
</ItemGroup>
100102

source/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
88

99
[assembly: Android.LinkerSafe]
10+
[assembly: AssemblyMetadata ("IsTrimmable", "True")]

source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>MonoAndroid90</TargetFramework>
3+
<TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
44
<AssemblyName>Xamarin.AndroidX.AppCompat.Resources</AssemblyName>
55
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
66
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>

source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>MonoAndroid90</TargetFramework>
3+
<TargetFrameworks>MonoAndroid9.0;net6.0-android30.0</TargetFrameworks>
44
<IsBindingProject>true</IsBindingProject>
55
<AssemblyName>Xamarin.Google.Android.Material.Extensions</AssemblyName>
66
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>

0 commit comments

Comments
 (0)