Skip to content
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

Jump to bottom

build: Simplify Directory.Build.props and PlatformItemGroups.props #439

Merged
merged 3 commits into from
Mar 2, 2023
Merged

build: Simplify Directory.Build.props and PlatformItemGroups.props #439

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c933fd4
build: Simplify Directory.Build.props and PlatformItemGroups.props
Youssef1313 Jan 1, 2023
b0ea504
chore: Fix
Youssef1313 Jan 2, 2023
6f2a9a1
chore: Address review comment
Youssef1313 Jan 11, 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
12 changes: 6 additions & 6 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
</PropertyGroup>

<PropertyGroup>
<IsMonoAndroid>false</IsMonoAndroid>
<IsMonoAndroid Condition="$(TargetFramework.ToLower().StartsWith('monoandroid')) or '$(TargetFramework)'=='net6.0-android'">true</IsMonoAndroid>
<IsAndroid>false</IsAndroid>
<IsAndroid Condition="$(TargetFramework.ToLower().StartsWith('monoandroid')) or '$(TargetFramework)'=='net6.0-android'">true</IsAndroid>

<IsXamarinIOS>false</IsXamarinIOS>
<IsXamarinIOS Condition="$(TargetFramework.ToLower().StartsWith('xamarinios')) or '$(TargetFramework)'=='net6.0-ios'">true</IsXamarinIOS>
<IsIOS>false</IsIOS>
<IsIOS Condition="$(TargetFramework.ToLower().StartsWith('xamarinios')) or '$(TargetFramework)'=='net6.0-ios'">true</IsIOS>

<IsXamarinMac>false</IsXamarinMac>
<IsXamarinMac Condition="$(TargetFramework.ToLower().StartsWith('xamarinmac')) or '$(TargetFramework)'=='net6.0-macos'">true</IsXamarinMac>
<IsMacOS>false</IsMacOS>
<IsMacOS Condition="$(TargetFramework.ToLower().StartsWith('xamarinmac')) or '$(TargetFramework)'=='net6.0-macos'">true</IsMacOS>
</PropertyGroup>

<PropertyGroup>
Expand Down
48 changes: 19 additions & 29 deletions src/PlatformItemGroups.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
<Project ToolsVersion="15.0">

<PropertyGroup>
<_IsAndroid>false</_IsAndroid>
<_IsAndroid Condition="$(IsMonoAndroid) or '$(TargetFramework)'=='net6.0-android'">true</_IsAndroid>
<IsCatalyst>false</IsCatalyst>
<IsCatalyst Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">true</IsCatalyst>
Xiaoy312 marked this conversation as resolved.
Show resolved Hide resolved

<_IsCatalyst>false</_IsCatalyst>
<_IsCatalyst Condition="$(_IsCatalyst) or '$(TargetFramework)'=='net6.0-maccatalyst'">true</_IsCatalyst>

<_IsIOS>false</_IsIOS>
<_IsIOS Condition="$(IsXamarinIOS) or '$(TargetFramework)'=='net6.0-ios' or '$(TargetFramework)'=='net6.0-maccatalyst'">true</_IsIOS>

<_IsMacOS>false</_IsMacOS>
<_IsMacOS Condition="'$(TargetFramework)'=='xamarinmac20' or '$(TargetFramework)'=='net6.0-macos'">true</_IsMacOS>

<_IsNet>false</_IsNet>
<_IsNet Condition="'$(TargetFramework)'=='net461'">true</_IsNet>
<IsIOSOrCatalyst>false</IsIOSOrCatalyst>
<IsIOSOrCatalyst Condition="$(IsIOS) or $(IsCatalyst)">true</IsIOSOrCatalyst>

<_IsNetCore>false</_IsNetCore>
<_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">true</_IsNetCore>
Expand All @@ -29,41 +20,40 @@
<_IsWinUI Condition="$(TargetFramework.Contains('-windows'))">true</_IsWinUI>
</PropertyGroup>

<PropertyGroup Condition="$(_IsIOS)">
<DefineConstants>$(DefineConstants);IOS1_0;XAMARIN;XAMARIN_IOS;XAMARIN_IOS_UNIFIED</DefineConstants>
<PropertyGroup Condition="$(IsIOSOrCatalyst)">
<DefineConstants>$(DefineConstants);XAMARIN;XAMARIN_IOS;XAMARIN_IOS_UNIFIED</DefineConstants>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsMacOS)">
<PropertyGroup Condition="$(IsMacOS)">
<DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsCatalyst)">
<PropertyGroup Condition="$(IsCatalyst)">
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsAndroid)">
<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;MONOANDROID5_0;XAMARIN_ANDROID</DefineConstants>
<PropertyGroup Condition="$(IsAndroid)">
<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;XAMARIN_ANDROID</DefineConstants>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<IncludedPlatformExtension Condition="$(_IsNetStd)" Include="netstd" />
<IncludedPlatformExtension Condition="$(_IsNetStd) and '$(UnoRuntimeIdentifier)'=='WebAssembly'" Include="wasm" />
<IncludedPlatformExtension Condition="$(_IsNetStd) and '$(UnoRuntimeIdentifier)'=='Skia'" Include="skia" />
<IncludedPlatformExtension Condition="'$(UnoRuntimeIdentifier)'=='WebAssembly'" Include="wasm" />
<IncludedPlatformExtension Condition="'$(UnoRuntimeIdentifier)'=='Skia'" Include="skia" />
<IncludedPlatformExtension Condition="$(_IsNetStd) and '$(UnoRuntimeIdentifier)'=='Reference'" Include="netstdref" />
<IncludedPlatformExtension Condition="$(_IsIOS)" Include="iOS" />
<IncludedPlatformExtension Condition="$(_IsMacOS)" Include="macOS" />
<IncludedPlatformExtension Condition="$(_IsMacOS) or $(_IsIOS)" Include="iOSmacOS" />
<IncludedPlatformExtension Condition="$(_IsAndroid)" Include="Android" />
<IncludedPlatformExtension Condition="$(_IsAndroid) or $(_IsIOS) or $(_IsMacOS)" Include="Xamarin" />
<IncludedPlatformExtension Condition="$(IsIOSOrCatalyst)" Include="iOS" />
<IncludedPlatformExtension Condition="$(IsMacOS)" Include="macOS" />
<IncludedPlatformExtension Condition="$(IsMacOS) or $(IsIOSOrCatalyst)" Include="iOSmacOS" />
<IncludedPlatformExtension Condition="$(IsAndroid)" Include="Android" />
<IncludedPlatformExtension Condition="'$(TargetFramework)'=='uap10.0'" Include="WinRT" />
<IncludedPlatformExtension Condition="'$(TargetFramework)'=='net461'" Include="net" />
</ItemGroup>

<Choose>
<When Condition="$(_IsAndroid) or $(_IsIOS)">
<When Condition="$(IsAndroid) or $(IsIOSOrCatalyst)">
<ItemGroup>
<IncludeXamlNamespaces Include="mobile" />
<ExcludeXamlNamespaces Include="not_mobile" />
Expand All @@ -78,7 +68,7 @@
</Choose>

<ItemGroup>
<AndroidResource Include="Resources\**\*.xml" Condition="$(_IsAndroid)" />
<AndroidResource Include="Resources\**\*.xml" Condition="$(IsAndroid)" />

<None Include="**\*.%(IncludedPlatformExtension.Identity).cs" Exclude="bin\**\*.%(IncludedPlatformExtension.Identity).cs;obj\**\*.%(IncludedPlatformExtension.Identity).cs" />
<Compile Remove="**\*.%(IncludedPlatformExtension.Identity).cs" />
Expand All @@ -87,7 +77,7 @@

<Page Include="**\*.xaml"
Exclude="bin/**/*.xaml;obj/**/*.xaml"
Condition="$(_IsAndroid) or $(_IsIOS) or $(_IsUWP) or $(_IsNetStd) or $(_IsMacOS)" />
Condition="$(IsAndroid) or $(IsIOSOrCatalyst) or $(_IsUWP) or $(_IsNetStd) or $(IsMacOS)" />

</ItemGroup>

Expand Down