Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Add support for .NET 6 & 7 Android workloads #41

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Add support for .NET 6 & 7 Android workloads #41

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions samples/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<!-- Workaround for current .NET 6 -->
<UseMicrosoftAndroidSdk>true</UseMicrosoftAndroidSdk>
</PropertyGroup>
</Project>
16 changes: 15 additions & 1 deletion src/Xamarin.Legacy.Sdk/Sdk/Xamarin.Legacy.Android.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,21 @@
<TargetPlatformIdentifier>Android</TargetPlatformIdentifier>
<AndroidUseIntermediateDesignerFile Condition=" '$(AndroidUseIntermediateDesignerFile)' == '' ">true</AndroidUseIntermediateDesignerFile>
</PropertyGroup>
<Import Sdk="Microsoft.Android.Sdk" Project="../targets/Microsoft.Android.Sdk.DefaultProperties.targets" />
<Import
Condition=" '$(UseMicrosoftAndroidSdk)' == 'true' "
Sdk="Microsoft.Android.Sdk"
Project="../targets/Microsoft.Android.Sdk.DefaultProperties.targets"
/>
<Import
Condition=" '$(UseMicrosoftAndroidSdk)' != 'true' and ('$(UseMicrosoftAndroidSdkNet6)' == 'true' or !$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')))"
Sdk="Microsoft.Android.Sdk.net6"
Project="../targets/Microsoft.Android.Sdk.DefaultProperties.targets"
/>
<Import
Condition=" '$(UseMicrosoftAndroidSdk)' != 'true' and ('$(UseMicrosoftAndroidSdkNet7)' == 'true' or $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')))"
Sdk="Microsoft.Android.Sdk.net7"
Project="../targets/Microsoft.Android.Sdk.DefaultProperties.targets"
/>
<Import Project="$(_LegacyExtensionsPath)/Xamarin/Android/Xamarin.Android.CSharp.targets" Condition=" '$(IsBindingProject)' != 'true' and '$(_FixupsNeeded)' == 'true' " />
<Import Project="$(_LegacyExtensionsPath)/Xamarin/Android/Xamarin.Android.Bindings.targets" Condition=" '$(IsBindingProject)' == 'true' and '$(_FixupsNeeded)' == 'true' " />
<Import Project="$(MSBuildExtensionsPath)/Xamarin/Android/Xamarin.Android.CSharp.targets" Condition=" '$(IsBindingProject)' != 'true' and '$(_FixupsNeeded)' != 'true' " />
Expand Down