Fixes for macOS

binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj

@@ -55,16 +55,16 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64\libHarfBuzzSharp.so">
+    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so">
       <Link>libs\arm64-v8a\libHarfBuzzSharp.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm\libHarfBuzzSharp.so">
+    <EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so">
       <Link>libs\armeabi-v7a\libHarfBuzzSharp.so</Link>
     </EmbeddedNativeLibrary>
     <EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libHarfBuzzSharp.so">
       <Link>libs\x86\libHarfBuzzSharp.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\x64\libHarfBuzzSharp.so">
+    <EmbeddedNativeLibrary Include="..\..\output\native\android\x86_64\libHarfBuzzSharp.so">
       <Link>libs\x86_64\libHarfBuzzSharp.so</Link>
     </EmbeddedNativeLibrary>
   </ItemGroup>

cake/BuildExternals.cake

@@ -1,14 +1,15 @@
 
 void GnNinja (DirectoryPath outDir, string target, string skiaArgs)
 {
+    var exe = IsRunningOnWindows () ? ".exe" : "";
     // generate native skia build files
-    RunProcess (SKIA_PATH.CombineWithFilePath("bin/gn.exe"), new ProcessSettings {
+    RunProcess (SKIA_PATH.CombineWithFilePath($"bin/gn{exe}"), new ProcessSettings {
         Arguments = $"gen out/{outDir} --args={skiaArgs}",
         WorkingDirectory = SKIA_PATH.FullPath,
     });
 
     // build native skia
-    RunProcess (DEPOT_PATH.CombineWithFilePath ("ninja.exe"), new ProcessSettings {
+    RunProcess (DEPOT_PATH.CombineWithFilePath ($"ninja{exe}"), new ProcessSettings {
         Arguments = $"{target} -C out/{outDir}",
         WorkingDirectory = SKIA_PATH.FullPath,
     });

tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj

@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.1.build3958" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj">