Exclude System.Globalization.Native and System.Security.Cryptography.…

…Native.OpenSsl for iOSLike platforms
dotnet · Feb 16, 2023 · 3283372 · 3283372
1 parent 675b5a0
commit 3283372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -64,12 +64,12 @@ The .NET Foundation licenses this file to you under the MIT license.
     <ItemGroup>
       <NetCoreAppNativeLibrary Include="System.Native" />
       <!-- FIXME: The library is currently not available for iOS-like platforms -->
-      <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true' and '$(_IsApplePlatform)' != 'true'" />
+      <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true' and '$(_IsiOSLikePlatform)' != 'true'" />
       <NetCoreAppNativeLibrary Include="System.IO.Compression.Native" />
       <NetCoreAppNativeLibrary Include="System.Net.Security.Native" />
       <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.Apple" Condition="'$(_IsApplePlatform)' == 'true'" />
       <!-- Not compliant for iOS-like platforms -->
-      <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.OpenSsl" Condition="'$(StaticOpenSslLinking)' != 'true' and '$(_IsApplePlatform)' != 'true'" />
+      <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.OpenSsl" Condition="'$(StaticOpenSslLinking)' != 'true' and '$(_IsiOSLikePlatform)' != 'true'" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -35,7 +35,8 @@ The .NET Foundation licenses this file to you under the MIT license.
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     <PublishTrimmed Condition="'$(PublishTrimmed)' == ''">true</PublishTrimmed>
     <RunILLink>false</RunILLink>
-    <_IsApplePlatform Condition="'$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or $(TargetOS.StartsWith('ios')) or $(TargetOS.StartsWith('tvos'))">true</_IsApplePlatform>
+    <_IsiOSLikePlatform Condition="'$(TargetOS)' == 'maccatalyst' or $(TargetOS.StartsWith('ios')) or $(TargetOS.StartsWith('tvos'))">true</_IsiOSLikePlatform>
+    <_IsApplePlatform Condition="'$(TargetOS)' == 'osx' or '$(_IsiOSLikePlatform)' == 'true'">true</_IsApplePlatform>
   </PropertyGroup>
 
   <!-- Set up the defaults for the compatibility mode -->