diff options
| author | Jo Shields <directhex@apebox.org> | 2021-02-08 22:26:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 22:26:14 +0300 |
| commit | 44f8f0faee42367bdd39277d8295f6e914ad7f4a (patch) | |
| tree | 81c3178b9160b3aa58612cac42914d556853a13e /Directory.Build.props | |
| parent | 5d5c3e7a589e21e43ad6464b6ed6732e98e7fc8a (diff) | |
Add Mac Catalyst (iOS API, Mac ABI) runtime (#47823)
Initial support for Mac Catalyst for mono subset. This enables building runtime packs and working jobs, but right now the `tests` subset needs some work to allow library test runs in CI
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 6ca4871c714..bda23977ca1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,7 +17,7 @@ <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('SOLARIS'))">Solaris</TargetOS> <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSUnixLike())">Linux</TargetOS> <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('WINDOWS'))">windows</TargetOS> - <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Browser'">true</TargetsMobile> + <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile> </PropertyGroup> <!-- Platform property is required by RepoLayout.props in Arcade SDK. --> @@ -117,6 +117,7 @@ <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos</_portableOS> <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris</_portableOS> <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser</_portableOS> + <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst</_portableOS> <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios</_portableOS> <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos</_portableOS> <_portableOS Condition="'$(_runtimeOS)' == 'android'">android</_portableOS> @@ -144,8 +145,8 @@ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('WINDOWS'))">win-x64</_toolRuntimeRID> <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_toolRuntimeRID> - <!-- There are no iOS or tvOS tools and it can be built on OSX only, so use that --> - <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID> + <!-- There are no Mac Catalyst, iOS or tvOS tools and it can be built on OSX only, so use that --> + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID> <MicrosoftNetCoreIlasmPackageRuntimeId>$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId> @@ -160,6 +161,7 @@ <_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture)</_outputRID> <_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture)</_outputRID> <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)</_outputRID> + <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture)</_outputRID> <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)</_outputRID> <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)</_outputRID> <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)</_outputRID> @@ -176,6 +178,7 @@ <TargetsLinux Condition="'$(TargetOS)' == 'Linux' or '$(TargetOS)' == 'Android'">true</TargetsLinux> <TargetsNetBSD Condition="'$(TargetOS)' == 'NetBSD'">true</TargetsNetBSD> <TargetsOSX Condition="'$(TargetOS)' == 'OSX'">true</TargetsOSX> + <TargetsMacCatalyst Condition="'$(TargetOS)' == 'MacCatalyst'">true</TargetsMacCatalyst> <TargetsiOS Condition="'$(TargetOS)' == 'iOS'">true</TargetsiOS> <TargetstvOS Condition="'$(TargetOS)' == 'tvOS'">true</TargetstvOS> <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">true</TargetsiOSSimulator> @@ -183,7 +186,7 @@ <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid> <TargetsBrowser Condition="'$(TargetOS)' == 'Browser'">true</TargetsBrowser> <TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows> - <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix> + <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix> </PropertyGroup> <!--Feature switches --> |