From 30dedb1a843ed31020c11edb0ac51e3d46db710a Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 1 Apr 2021 08:54:43 +0200
Subject: [PATCH] Actually use the new framework

---
 binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs   |  6 +--
 .../HarfBuzzSharp.iOS.csproj                  |  4 +-
 .../build/xamarinios1.0/HarfBuzzSharp.targets |  2 +-
 .../HarfBuzzSharp.tvOS.csproj                 |  4 +-
 .../xamarintvos1.0/HarfBuzzSharp.targets      |  2 +-
 .../HarfBuzzSharp.watchOS.csproj              |  4 +-
 .../xamarinwatchos1.0/HarfBuzzSharp.targets   |  2 +-
 nuget/HarfbuzzSharp.nuspec                    |  6 +--
 scripts/create-dummy-native.ps1               | 48 -------------------
 9 files changed, 15 insertions(+), 63 deletions(-)
 delete mode 100644 scripts/create-dummy-native.ps1

diff --git a/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs b/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs
index 719525c6..10b7cf9f 100644
--- a/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs
+++ b/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs
@@ -5,11 +5,11 @@ namespace HarfBuzzSharp
 	internal unsafe partial class HarfBuzzApi
 	{
 #if __TVOS__ && __UNIFIED__
-		private const string HARFBUZZ = "__Internal";
+		private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
 #elif __WATCHOS__ && __UNIFIED__
-		private const string HARFBUZZ = "__Internal";
+		private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
 #elif __IOS__ && __UNIFIED__
-		private const string HARFBUZZ = "__Internal";
+		private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
 #elif __ANDROID__
 		private const string HARFBUZZ = "libHarfBuzzSharp.so";
 #elif __MACOS__
diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
index 2e9931ce..abf2dfc0 100644
--- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
+++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
@@ -7,10 +7,10 @@
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\ios\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\ios\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+    <None Include="nuget\build\xamarinios1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets
index f4d3ec41..a7e1611b 100644
--- a/binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
-        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
index 58994771..dec88f38 100644
--- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
+++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
@@ -7,10 +7,10 @@
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\tvos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\tvos\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+    <None Include="nuget\build\xamarintvos1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets
index f4d3ec41..a7e1611b 100644
--- a/binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
-        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
index 22ed006c..c1cf0ed9 100644
--- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
+++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
@@ -7,10 +7,10 @@
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\output\native\watchos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
+    <None Include="..\..\output\native\watchos\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
+    <None Include="nuget\build\xamarinwatchos1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets
index f4d3ec41..a7e1611b 100644
--- a/binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
-        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
+        <NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec
index 4f0853b1..7bab04f5 100644
--- a/nuget/HarfbuzzSharp.nuspec
+++ b/nuget/HarfbuzzSharp.nuspec
@@ -124,11 +124,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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" />
+    <file platform="macos" src="build/xamarinios1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarinios1.0/libHarfBuzzSharp.framework" />
     <!-- tvos -->
-    <file platform="macos" src="build/xamarintvos1.0/libHarfBuzzSharp.a" />
+    <file platform="macos" src="build/xamarintvos1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarintvos1.0/libHarfBuzzSharp.framework" />
     <!-- watchos -->
-    <file platform="macos" src="build/xamarinwatchos1.0/libHarfBuzzSharp.a" />
+    <file platform="macos" src="build/xamarinwatchos1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarinwatchos1.0/libHarfBuzzSharp.framework" />
 
 
     <!-- legal -->
diff --git a/scripts/create-dummy-native.ps1 b/scripts/create-dummy-native.ps1
deleted file mode 100644
index 41fe87c7..00000000
--- a/scripts/create-dummy-native.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-function Dummy {
-    param ([string] $RootPath, [string[]] $Platforms, [string[]] $FileNames)
-
-    foreach ($platform in $Platforms) {
-        foreach ($filename in $FileNames) {
-            New-Item -ItemType File -Force -Path "$RootPath/$platform/$filename" | Out-Null
-        }
-    }
-}
-
-Dummy output/native/android @('arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64') @(
-    'libSkiaSharp.so',
-    'libHarfBuzzSharp.so')
-
-Dummy output/native/ios @('.') @(
-    'libHarfBuzzSharp.a',
-    'libSkiaSharp.framework/libSkiaSharp')
-
-Dummy output/native/linux @('x64') @(
-    'libSkiaSharp.so',
-    'libHarfBuzzSharp.so')
-
-Dummy output/native/osx @('.') @(
-    'libHarfBuzzSharp.dylib',
-    'libSkiaSharp.dylib')
-
-Dummy output/native/tizen @('armel', 'i386') @(
-    'libSkiaSharp.so',
-    'libHarfBuzzSharp.so')
-
-Dummy output/native/tvos @('.') @(
-    'libHarfBuzzSharp.a',
-    'libSkiaSharp.framework/libSkiaSharp')
-
-Dummy output/native/uwp @('arm', 'x86', 'x64') @(
-    'libSkiaSharp.dll',
-    'libHarfBuzzSharp.dll',
-    'SkiaSharp.Views.Interop.UWP.dll',
-    'libEGL.dll',
-    'libGLESv2.dll')
-
-Dummy output/native/watchos @('.') @(
-    'libHarfBuzzSharp.a',
-    'libSkiaSharp.framework/libSkiaSharp')
-
-Dummy output/native/windows @('x86', 'x64') @(
-    'libSkiaSharp.dll',
-    'libHarfBuzzSharp.dll')