Skip to content

Commit 5490fc0

Browse files
authored
Begin building net7.0-android TF. (#809)
1 parent d2331d0 commit 5490fc0

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

Directory.Build.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
77

88
<!-- Default TFM's we build for -->
9-
<_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android</_DefaultTargetFrameworks>
9+
<_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android</_DefaultTargetFrameworks>
1010

1111
<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
1212
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
@@ -43,14 +43,17 @@
4343
<ItemGroup>
4444
<AndroidXNuGetTargetFolders Include="build\monoandroid12.0" />
4545
<AndroidXNuGetTargetFolders Include="build\net6.0-android31.0" />
46+
<AndroidXNuGetTargetFolders Include="build\net7.0-android33.0" />
4647
<AndroidXNuGetTargetFolders Include="buildTransitive\monoandroid12.0" />
4748
<AndroidXNuGetTargetFolders Include="buildTransitive\net6.0-android31.0" />
49+
<AndroidXNuGetTargetFolders Include="buildTransitive\net7.0-android33.0" />
4850
</ItemGroup>
4951

5052
<!-- Folders that _._ files need to go into for packages without managed libraries -->
5153
<ItemGroup>
5254
<AndroidXNuGetLibFolders Include="lib\monoandroid12.0" />
5355
<AndroidXNuGetLibFolders Include="lib\net6.0-android31.0" />
56+
<AndroidXNuGetLibFolders Include="lib\net7.0-android33.0" />
5457
</ItemGroup>
5558

5659
<ItemGroup>

samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-android</TargetFramework>
4+
<TargetFrameworks>net6.0-android;net7.0-android</TargetFrameworks>
55

66
<!-- Some packages specify a minimum of 28 (eg: Xamarin.AndroidX.HeifWriter) -->
77
<SupportedOSPlatformVersion>28</SupportedOSPlatformVersion>

samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-android</TargetFrameworks>
4+
<TargetFrameworks>net6.0-android;net7.0-android</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>BuildAllMauiApp</RootNamespace>
77
<UseMaui>true</UseMaui>

workloads.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2-
"microsoft.net.sdk.android": "32.0.485/6.0.400",
3-
"microsoft.net.sdk.ios": "16.2.19/6.0.400",
4-
"microsoft.net.sdk.maccatalyst": "16.2.19/6.0.400",
5-
"microsoft.net.sdk.macos": "13.1.19/6.0.400",
6-
"microsoft.net.sdk.tvos": "16.1.257/6.0.400",
7-
"microsoft.net.sdk.maui": "6.0.552/6.0.400",
8-
"microsoft.net.workload.mono.toolchain": "6.0.15/6.0.400",
9-
"microsoft.net.workload.emscripten": "6.0.15/6.0.400"
2+
"microsoft.net.sdk.android": "33.0.95/7.0.100",
3+
"microsoft.net.sdk.ios": "16.4.7090/7.0.100",
4+
"microsoft.net.sdk.maccatalyst": "16.4.7090/7.0.100",
5+
"microsoft.net.sdk.macos": "13.3.7090/7.0.100",
6+
"microsoft.net.sdk.maui": "7.0.92/7.0.100",
7+
"microsoft.net.sdk.tvos": "16.4.7090/7.0.100",
8+
"microsoft.net.workload.mono.toolchain.net6": "7.0.10/7.0.100",
9+
"microsoft.net.workload.mono.toolchain.net7": "7.0.10/7.0.100",
10+
"microsoft.net.workload.emscripten.net6": "7.0.10/7.0.100",
11+
"microsoft.net.workload.emscripten.net7": "7.0.10/7.0.100"
1012
}

0 commit comments

Comments
 (0)