Skip to content

Begin building net7.0-android TF. #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 9, 2023
Merged

Begin building net7.0-android TF. #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e088ef
Begin building `net7.0-android` TF.
jpobst Nov 2, 2023
0f2d079
Begin building `net7.0-android` TF.
jpobst Nov 2, 2023
9ad9bf7
Merge branch 'net7' of https://github.com/xamarin/AndroidX into net7
jpobst Nov 7, 2023
36bf139
TargetFramework -> TargetFrameworks
jpobst Nov 7, 2023
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
5 changes: 4 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>

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

<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
Expand Down Expand Up @@ -43,14 +43,17 @@
<ItemGroup>
<AndroidXNuGetTargetFolders Include="build\monoandroid12.0" />
<AndroidXNuGetTargetFolders Include="build\net6.0-android31.0" />
<AndroidXNuGetTargetFolders Include="build\net7.0-android33.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\monoandroid12.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net6.0-android31.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net7.0-android33.0" />
</ItemGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-android</TargetFramework>
<TargetFrameworks>net6.0-android;net7.0-android</TargetFrameworks>

<!-- Some packages specify a minimum of 28 (eg: Xamarin.AndroidX.HeifWriter) -->
<SupportedOSPlatformVersion>28</SupportedOSPlatformVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<TargetFrameworks>net6.0-android;net7.0-android</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>BuildAllMauiApp</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down
18 changes: 10 additions & 8 deletions workloads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"microsoft.net.sdk.android": "32.0.485/6.0.400",
"microsoft.net.sdk.ios": "16.2.19/6.0.400",
"microsoft.net.sdk.maccatalyst": "16.2.19/6.0.400",
"microsoft.net.sdk.macos": "13.1.19/6.0.400",
"microsoft.net.sdk.tvos": "16.1.257/6.0.400",
"microsoft.net.sdk.maui": "6.0.552/6.0.400",
"microsoft.net.workload.mono.toolchain": "6.0.15/6.0.400",
"microsoft.net.workload.emscripten": "6.0.15/6.0.400"
"microsoft.net.sdk.android": "33.0.95/7.0.100",
"microsoft.net.sdk.ios": "16.4.7090/7.0.100",
"microsoft.net.sdk.maccatalyst": "16.4.7090/7.0.100",
"microsoft.net.sdk.macos": "13.3.7090/7.0.100",
"microsoft.net.sdk.maui": "7.0.92/7.0.100",
"microsoft.net.sdk.tvos": "16.4.7090/7.0.100",
"microsoft.net.workload.mono.toolchain.net6": "7.0.10/7.0.100",
"microsoft.net.workload.mono.toolchain.net7": "7.0.10/7.0.100",
"microsoft.net.workload.emscripten.net6": "7.0.10/7.0.100",
"microsoft.net.workload.emscripten.net7": "7.0.10/7.0.100"
}