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

Commit faf04b3

Browse files
[Xamarin.Build.Download] add appropriate .NET 6 checks (#1000)
Right now Xamarin.Build.Download does not work appropriately in .NET 6 projects. It relies on the value of `$(TargetFrameworkIdentifier)`, which will be set to `.NETCoreApp` in .NET 6. To fix this, we can also check if `$(TargetPlatformIdentifer)` is equal to `ios` or `android`. This should enable Xamarin.Build.Download to work in .NET 6 projects going forward. I also tried to fix different casing for `or` and `and` -- to always use lowercase.
1 parent b24cbd9 commit faf04b3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
<XamarinBuildDownloadAllowUnsecure Condition="'$(XamarinBuildDownloadAllowUnsecure)' == ''">false</XamarinBuildDownloadAllowUnsecure>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)'=='Xamarin.iOS' And ('$(OutputType)' != 'Library' OR '$(IsAppExtension)'=='True')">
13+
<PropertyGroup Condition="('$(TargetFrameworkIdentifier)'=='Xamarin.iOS' or '$(TargetPlatformIdentifier)'=='ios') and ('$(OutputType)' != 'Library' or '$(IsAppExtension)'=='True')">
1414
<_XamarinBuildDownloadMasterBeforeTargets>GetFrameworkPaths</_XamarinBuildDownloadMasterBeforeTargets>
1515
<_XamarinBuildDownloadMasterDependsOnTargets>_XamarinBuildDownload;_XamarinBuildCastAssemblyResources</_XamarinBuildDownloadMasterDependsOnTargets>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)'=='MonoAndroid'">
18+
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)'=='MonoAndroid' or '$(TargetPlatformIdentifier)'=='android'">
1919
<_XamarinBuildDownloadIsAndroid>true</_XamarinBuildDownloadIsAndroid>
2020
<_XamarinBuildDownloadMasterBeforeTargets>_ResolveLibraryProjectImports</_XamarinBuildDownloadMasterBeforeTargets>
2121
<_XamarinBuildDownloadMasterDependsOnTargets>ResolveAssemblyReferences;_XamarinBuildDownload;_XamarinBuildDownloadAarRestore;_XamarinBuildDownloadAarInclude</_XamarinBuildDownloadMasterDependsOnTargets>
2222
<_XamarinBuildDownloadAndroidFixManifests Condition="'$(_XamarinBuildDownloadAndroidFixManifests)' == ''">true</_XamarinBuildDownloadAndroidFixManifests>
2323
</PropertyGroup>
2424

25-
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)'!='MonoAndroid'">
25+
<PropertyGroup Condition="'$(_XamarinBuildDownloadIsAndroid)'==''">
2626
<_XamarinBuildDownloadIsAndroid>false</_XamarinBuildDownloadIsAndroid>
2727
</PropertyGroup>
2828

0 commit comments

Comments
 (0)