Fix Packaging (#1366)

* Move non-netcoreapp native files into build
* Update samples
* Fix iOS GL interface assembler

binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj

@@ -8,10 +8,13 @@
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so" Link="libs\arm64-v8a\libHarfBuzzSharp.so" />
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so" Link="libs\armeabi-v7a\libHarfBuzzSharp.so" />
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libHarfBuzzSharp.so" Link="libs\x86\libHarfBuzzSharp.so" />
-    <EmbeddedNativeLibrary Include="..\..\output\native\android\x86_64\libHarfBuzzSharp.so" Link="libs\x86_64\libHarfBuzzSharp.so" />
+    <None Include="..\..\output\native\android\x86\libHarfBuzzSharp.so" Link="nuget\build\$(PackagingPlatform)\x86\libHarfBuzzSharp.so" />
+    <None Include="..\..\output\native\android\x86_64\libHarfBuzzSharp.so" Link="nuget\build\$(PackagingPlatform)\x64\libHarfBuzzSharp.so" />
+    <None Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so" Link="nuget\build\$(PackagingPlatform)\arm\libHarfBuzzSharp.so" />
+    <None Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so" Link="nuget\build\$(PackagingPlatform)\arm64\libHarfBuzzSharp.so" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="nuget\build\monoandroid1.0\HarfBuzzSharp.targets" Link="nuget\build\$(PackagingPlatform)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

binding/HarfBuzzSharp.Android/nuget/build/monoandroid1.0/HarfBuzzSharp.targets

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp -->
+    <PropertyGroup>
+        <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so" Abi="x86" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x64\libHarfBuzzSharp.so" Abi="x86_64" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so" Abi="armeabi-v7a" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm64\libHarfBuzzSharp.so" Abi="arm64-v8a" />
+    </ItemGroup>
+
+</Project>

binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj

@@ -5,15 +5,15 @@
     <AssemblyName>HarfBuzzSharp</AssemblyName>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <DefineConstants>$(DefineConstants);HARFBUZZ;__MACOS__</DefineConstants>
-    <IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
-    <ObjcBindingCoreSource Include="Structs.cs" />
-    <ObjcBindingNativeLibrary Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="libHarfBuzzSharp.dylib" />
+    <None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="nuget\runtimes\osx\native\libHarfBuzzSharp.dylib" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="nuget\build\xamarinmac2.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

binding/HarfBuzzSharp.OSX/Properties/AssemblyInfo.cs

@@ -1,5 +1,3 @@
 using Foundation;
-using ObjCRuntime;
 
 [assembly: LinkerSafe]
-[assembly: LinkWith("libHarfBuzzSharp.dylib", IsCxx = true, ForceLoad = true, SmartLink = true)]

binding/HarfBuzzSharp.OSX/nuget/build/xamarinmac2.0/HarfBuzzSharp.targets

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp -->
+    <PropertyGroup>
+        <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
+        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp.dylib" Kind="Dynamic" />
+    </ItemGroup>
+
+</Project>

binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj

@@ -12,9 +12,9 @@
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Link="nuget\runtimes\tizen-armel\native\libHarfBuzzSharp.so" />
-    <None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.so" Link="nuget\runtimes\tizen-x86\native\libHarfBuzzSharp.so" />
-    <None Include="nuget\build\tizen40\HarfBuzzSharp.targets" />
+    <None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Link="nuget\build\$(TargetFramework)\arm\libHarfBuzzSharp.so" />
+    <None Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.so" Link="nuget\build\$(TargetFramework)\x86\libHarfBuzzSharp.so" />
+    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

binding/HarfBuzzSharp.Tizen/nuget/build/tizen40/HarfBuzzSharp.targets

@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- HACK: temporary until the Tizen/.NET Core tooling can understand the tizen-x86 RID as opposed to linux-x86 -->
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == ''">
-        <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\tizen-x86\native\libHarfBuzzSharp.so">
-            <Visible>false</Visible>
-            <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
-            <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
-        </TizenTpkFiles>
-    </ItemGroup>
-
-  <!-- HACK: temporary until the Tizen/.NET Core tooling can remove the non-tizen RIDs -->
-  <Target Name="RemoveTizenPlatformAssemblies" AfterTargets="TizenResolveTpkPackageFiles">
-    <ItemGroup>
-      <_SuppressPackaging Include="@(TizenResolvedFileToTpk)" Condition="
-        $([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\')) and
-        !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\linux-x86\native\')) and
-        !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\tizen-armel\native\'))" />
-      <TizenResolvedFileToTpk Remove="@(_SuppressPackaging)" />
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so">
+      <Visible>false</Visible>
+      <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
+      <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
+    </TizenTpkFiles>
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so">
+      <Visible>false</Visible>
+      <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
+      <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
+    </TizenTpkFiles>
+  </ItemGroup>
 
 </Project>

binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj

@@ -5,15 +5,15 @@
     <AssemblyName>HarfBuzzSharp</AssemblyName>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
-    <IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
-    <ObjcBindingCoreSource Include="Structs.cs" />
-    <ObjcBindingNativeLibrary Include="..\..\output\native\ios\libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\ios\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

binding/HarfBuzzSharp.iOS/Properties/AssemblyInfo.cs

@@ -1,5 +1,3 @@
 using Foundation;
-using ObjCRuntime;
 
 [assembly: LinkerSafe]
-[assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)]

binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp -->
+    <PropertyGroup>
+        <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
+        <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+    </ItemGroup>
+
+</Project>

binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj

@@ -5,15 +5,15 @@
     <AssemblyName>HarfBuzzSharp</AssemblyName>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
-    <IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
-    <ObjcBindingCoreSource Include="Structs.cs" />
-    <ObjcBindingNativeLibrary Include="..\..\output\native\tvos\libHarfBuzzSharp.a" Link="libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\tvos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

binding/HarfBuzzSharp.tvOS/Properties/AssemblyInfo.cs

@@ -1,5 +1,3 @@
 using Foundation;
-using ObjCRuntime;
 
 [assembly: LinkerSafe]
-[assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)]

binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp -->
+    <PropertyGroup>
+        <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
+        <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+    </ItemGroup>
+
+</Project>

binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj

@@ -5,15 +5,15 @@
     <AssemblyName>HarfBuzzSharp</AssemblyName>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
-    <IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
-    <ObjcBindingCoreSource Include="Structs.cs" />
-    <ObjcBindingNativeLibrary Include="..\..\output\native\watchos\libHarfBuzzSharp.a" Link="libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\watchos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

binding/HarfBuzzSharp.watchOS/Properties/AssemblyInfo.cs

@@ -1,5 +1,3 @@
 using Foundation;
-using ObjCRuntime;
 
 [assembly: LinkerSafe]
-[assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)]

binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp -->
+    <PropertyGroup>
+        <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
+        <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+    </ItemGroup>
+
+</Project>

binding/HarfBuzzSharp/nuget/build/net462/HarfBuzzSharp.targets

@@ -39,7 +39,7 @@
         <!-- Windows -->
         <_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libHarfBuzzSharp*.dll" Dir="x86\" />
         <_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libHarfBuzzSharp*.dll" Dir="x64\" />
-        <_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-amr64\native\libHarfBuzzSharp*.dll" Dir="arm64\" />
+        <_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libHarfBuzzSharp*.dll" Dir="arm64\" />
 
         <!-- Linux -->
         <_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libHarfBuzzSharp*.so" Dir="x86\" />

binding/SkiaSharp.Android/SkiaSharp.Android.csproj

@@ -7,10 +7,10 @@
     <PackagingPlatform>monoandroid1.0</PackagingPlatform>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\android\x86\libSkiaSharp.so" Link="nuget\runtimes\android-x86\native\libSkiaSharp.so" />
-    <None Include="..\..\output\native\android\x86_64\libSkiaSharp.so" Link="nuget\runtimes\android-x64\native\libSkiaSharp.so" />
-    <None Include="..\..\output\native\android\armeabi-v7a\libSkiaSharp.so" Link="nuget\runtimes\android-arm\native\libSkiaSharp.so" />
-    <None Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="nuget\runtimes\android-arm64\native\libSkiaSharp.so" />
+    <None Include="..\..\output\native\android\x86\libSkiaSharp.so" Link="nuget\build\$(PackagingPlatform)\x86\libSkiaSharp.so" />
+    <None Include="..\..\output\native\android\x86_64\libSkiaSharp.so" Link="nuget\build\$(PackagingPlatform)\x64\libSkiaSharp.so" />
+    <None Include="..\..\output\native\android\armeabi-v7a\libSkiaSharp.so" Link="nuget\build\$(PackagingPlatform)\arm\libSkiaSharp.so" />
+    <None Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="nuget\build\$(PackagingPlatform)\arm64\libSkiaSharp.so" />
   </ItemGroup>
   <ItemGroup>
     <None Include="nuget\build\monoandroid1.0\SkiaSharp.targets" Link="nuget\build\$(PackagingPlatform)\SkiaSharp.targets" />

binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets

@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
-        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libSkiaSharp.so" Abi="x86" />
-        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x64\native\libSkiaSharp.so" Abi="x86_64" />
-        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm\native\libSkiaSharp.so" Abi="armeabi-v7a" />
-        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64\native\libSkiaSharp.so" Abi="arm64-v8a" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.so" Abi="x86" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.so" Abi="x86_64" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.so" Abi="armeabi-v7a" />
+        <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm64\libSkiaSharp.so" Abi="arm64-v8a" />
     </ItemGroup>
 
 </Project>

binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj

@@ -12,9 +12,9 @@
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\tizen\armel\libSkiaSharp.so" Link="nuget\runtimes\tizen-armel\native\libSkiaSharp.so" />
-    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.so" Link="nuget\runtimes\tizen-x86\native\libSkiaSharp.so" />
-    <None Include="nuget\build\tizen40\SkiaSharp.targets" />
+    <None Include="..\..\output\native\tizen\armel\libSkiaSharp.so" Link="nuget\build\$(TargetFramework)\arm\libSkiaSharp.so" />
+    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.so" Link="nuget\build\$(TargetFramework)\x86\libSkiaSharp.so" />
+    <None Include="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

binding/SkiaSharp.Tizen/nuget/build/tizen40/SkiaSharp.targets

@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- HACK: temporary until the Tizen/.NET Core tooling can understand the tizen-x86 RID as opposed to linux-x86 -->
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == ''">
-        <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\tizen-x86\native\libSkiaSharp.so">
-            <Visible>false</Visible>
-            <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
-            <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
-        </TizenTpkFiles>
-    </ItemGroup>
-
-  <!-- HACK: temporary until the Tizen/.NET Core tooling can remove the non-tizen RIDs -->
-  <Target Name="RemoveTizenPlatformAssemblies" AfterTargets="TizenResolveTpkPackageFiles">
-    <ItemGroup>
-      <_SuppressPackaging Include="@(TizenResolvedFileToTpk)" Condition="
-        $([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\')) and
-        !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\linux-x86\native\')) and
-        !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\tizen-armel\native\'))" />
-      <TizenResolvedFileToTpk Remove="@(_SuppressPackaging)" />
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.so">
+      <Visible>false</Visible>
+      <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
+      <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
+    </TizenTpkFiles>
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.so">
+      <Visible>false</Visible>
+      <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
+      <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
+    </TizenTpkFiles>
+  </ItemGroup>
 
 </Project>

binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj

@@ -6,7 +6,7 @@
     <PackagingGroup>SkiaSharp</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\ios\libSkiaSharp.framework\**" Link="nuget\runtimes\ios\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\ios\libSkiaSharp.framework\**" Link="nuget\build\$(TargetFramework)\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
     <None Include="nuget\build\xamarinios1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />

binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
-        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libSkiaSharp.framework" Kind="Framework" />
+        <NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>

binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj

@@ -6,7 +6,7 @@
     <PackagingGroup>SkiaSharp</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\tvos\libSkiaSharp.framework\**" Link="nuget\runtimes\tvos\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tvos\libSkiaSharp.framework\**" Link="nuget\build\$(TargetFramework)\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
     <None Include="nuget\build\xamarintvos1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />

binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
-        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\tvos\native\libSkiaSharp.framework" Kind="Framework" />
+        <NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>

binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj

@@ -6,7 +6,7 @@
     <PackagingGroup>SkiaSharp</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\watchos\libSkiaSharp.framework\**" Link="nuget\runtimes\watchos\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\watchos\libSkiaSharp.framework\**" Link="nuget\build\$(TargetFramework)\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
     <None Include="nuget\build\xamarinwatchos1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />

binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
-        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\watchos\native\libSkiaSharp.framework" Kind="Framework" />
+        <NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>

externals/skia

@@ -1 +1 @@
-Subproject commit 6b64a556d7a32cb81c7bf3a8b835b84bb2a26a68
+Subproject commit 042510730b439ae43829e5200f08889878e282e4

nuget/HarfbuzzSharp.nuspec

@@ -86,21 +86,44 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/tizen40/HarfBuzzSharp.xml" />
 
     <!-- the build bits -->
+    <!-- net4x (win32/macos/linux) -->
     <file src="build/net462/HarfBuzzSharp.targets" />
     <file src="build/net462/HarfBuzzSharp.targets" target="buildTransitive/net462/HarfBuzzSharp.targets" />
+    <!-- others -->
+    <file src="build/monoandroid1.0/HarfBuzzSharp.targets" />
+    <file src="build/xamarinios1.0/HarfBuzzSharp.targets" />
+    <file src="build/xamarintvos1.0/HarfBuzzSharp.targets" />
+    <file src="build/xamarinwatchos1.0/HarfBuzzSharp.targets" />
+    <file src="build/xamarinmac2.0/HarfBuzzSharp.targets" />
     <file src="build/tizen40/HarfBuzzSharp.targets" />
 
-    <!-- harfbuzz.dll and other native files -->
+    <!-- libHarfBuzzSharp.dll and other native files -->
+    <!-- win -->
     <file platform="windows" src="runtimes/win-x64/native/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win-x86/native/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win-arm64/native/libHarfBuzzSharp.dll" />
+    <!-- macos -->
     <file platform="macos" src="runtimes/osx/native/libHarfBuzzSharp.dylib" />
+    <!-- win10 -->
     <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
     <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
-    <file src="runtimes/tizen-armel/native/libHarfBuzzSharp.so" />
-    <file src="runtimes/tizen-x86/native/libHarfBuzzSharp.so" />
+    <!-- tizen -->
+    <file src="build/tizen40/arm/libHarfBuzzSharp.so" />
+    <file src="build/tizen40/x86/libHarfBuzzSharp.so" />
+    <!-- android -->
+    <file platform="macos,windows" src="build/monoandroid1.0/x64/libHarfBuzzSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/x86/libHarfBuzzSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/arm/libHarfBuzzSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/arm64/libHarfBuzzSharp.so" />
+    <!-- ios -->
+    <file platform="macos" src="build/xamarinios1.0/libHarfBuzzSharp.a" />
+    <!-- tvos -->
+    <file platform="macos" src="build/xamarintvos1.0/libHarfBuzzSharp.a" />
+    <!-- watchos -->
+    <file platform="macos" src="build/xamarinwatchos1.0/libHarfBuzzSharp.a" />
+
 
     <!-- legal -->
     <file src="LICENSE.txt" />

nuget/SkiaSharp.nuspec

@@ -119,19 +119,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
     <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
     <!-- tizen -->
-    <file src="runtimes/tizen-armel/native/libSkiaSharp.so" />
-    <file src="runtimes/tizen-x86/native/libSkiaSharp.so" />
+    <file src="build/tizen40/arm/libSkiaSharp.so" />
+    <file src="build/tizen40/x86/libSkiaSharp.so" />
     <!-- android -->
-    <file platform="macos,windows" src="runtimes/android-x64/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-x86/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm64/native/libSkiaSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/x64/libSkiaSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/x86/libSkiaSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/arm/libSkiaSharp.so" />
+    <file platform="macos,windows" src="build/monoandroid1.0/arm64/libSkiaSharp.so" />
     <!-- ios -->
-    <file platform="macos" src="runtimes/ios/native/libSkiaSharp.framework/" target="/" />
+    <file platform="macos" src="build/xamarinios1.0/libSkiaSharp.framework/" target="/" />
     <!-- tvos -->
-    <file platform="macos" src="runtimes/tvos/native/libSkiaSharp.framework/" target="/" />
+    <file platform="macos" src="build/xamarintvos1.0/libSkiaSharp.framework/" target="/" />
     <!-- watchos -->
-    <file platform="macos" src="runtimes/watchos/native/libSkiaSharp.framework/" target="/" />
+    <file platform="macos" src="build/xamarinwatchos1.0/libSkiaSharp.framework/" target="/" />
 
     <!-- Workbooks integration -->
     <file src="xamarin.interactive/SkiaSharp.Workbooks.dll" />

samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj

@@ -12,19 +12,6 @@
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!--
-    <None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-x86\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    -->
-    <None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
 </Project>

samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj

@@ -17,19 +17,6 @@
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!--
-    <None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-x86\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    -->
-    <None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
 </Project>

samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj

@@ -22,19 +22,6 @@
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!--
-    <None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-x86\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    -->
-    <None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so">
-      <Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
 </Project>

samples/Gallery/Xamarin.Forms/Android/Android.csproj

@@ -104,4 +104,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets')" />
+  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\monoandroid1.0\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\monoandroid1.0\HarfBuzzSharp.targets')" />
 </Project>

samples/Gallery/Xamarin.Forms/Mac/Mac.csproj

@@ -123,4 +123,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
+  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinmac2.0\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinmac2.0\HarfBuzzSharp.targets')" />
 </Project>

samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj

@@ -23,29 +23,6 @@
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!--
-    <None Include="..\..\..\..\output\native\tizen\i386\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libSkiaSharp.so')">
-      <Link>tpkroot\bin\runtimes\tizen-x86\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    -->
-    <None Include="..\..\..\..\output\native\tizen\armel\libSkiaSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libSkiaSharp.so')">
-      <Link>tpkroot\bin\runtimes\tizen-armel\native\libSkiaSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <!--
-    <None Include="..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\i386\libHarfBuzzSharp.so')">
-      <Link>tpkroot\bin\runtimes\tizen-x86\native\libHarfBuzzSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    -->
-    <None Include="..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Condition="Exists('..\..\..\..\output\native\tizen\armel\libHarfBuzzSharp.so')">
-      <Link>tpkroot\bin\runtimes\tizen-armel\native\libHarfBuzzSharp.so</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="res\" />
     <DefaultTpkResFiles Include="..\..\Shared\Media\content-font.ttf">

samples/Gallery/Xamarin.Forms/iOS/iOS.csproj

@@ -182,4 +182,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets')" />
+  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinios1.0\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinios1.0\HarfBuzzSharp.targets')" />
 </Project>

samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj

@@ -109,4 +109,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
+  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinmac2.0\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarinmac2.0\HarfBuzzSharp.targets')" />
 </Project>

samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj

@@ -153,4 +153,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets')" />
+  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarintvos1.0\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\xamarintvos1.0\HarfBuzzSharp.targets')" />
 </Project>