mono · mattleibow · Jun 19, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj b/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj
@@ -22,6 +22,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarinios1.0'">
     <!-- iOS -->
     <None Include="..\..\output\native\ios\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\ios\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\iossimulator\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\iossimulator\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
     <None Include="..\HarfBuzzSharp\nuget\build\xamarinios\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarintvos1.0'">

diff --git a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj
@@ -59,6 +59,7 @@
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
     <!-- iOS -->
     <None Include="..\..\output\native\ios\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\ios\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\iossimulator\libHarfBuzzSharp.framework\**" Link="nuget\runtimes\iossimulator\native\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
     <None Include="nuget\build\ios\HarfBuzzSharp.targets" Link="nuget\build\net$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))-ios\HarfBuzzSharp.targets" />
     <None Include="nuget\build\ios\HarfBuzzSharp.Local.targets" Link="nuget\build\net$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))-ios\HarfBuzzSharp.Local.targets" />
   </ItemGroup>

diff --git a/binding/HarfBuzzSharp/nuget/build/ios/HarfBuzzSharp.Local.targets b/binding/HarfBuzzSharp/nuget/build/ios/HarfBuzzSharp.Local.targets
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <ItemGroup>
-        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libHarfBuzzSharp.framework" Kind="Framework" />
+    <ItemGroup Condition="'$(RuntimeIdentifier)' != ''">
+        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\iossimulator\native\libHarfBuzzSharp.framework" Kind="Framework" Condition="$(RuntimeIdentifier.StartsWith('iossimulator'))" />
+        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libHarfBuzzSharp.framework" Kind="Framework" Condition="!$(RuntimeIdentifier.StartsWith('iossimulator'))" />
     </ItemGroup>
 
 </Project>
diff --git a/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj b/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj
@@ -21,6 +21,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarinios1.0'">
     <!-- iOS -->
     <None Include="..\..\output\native\ios\libSkiaSharp.framework\**" Link="nuget\runtimes\ios\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\iossimulator\libSkiaSharp.framework\**" Link="nuget\runtimes\iossimulator\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
     <None Include="..\SkiaSharp\nuget\build\xamarinios\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarintvos1.0'">

diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj
@@ -58,8 +58,9 @@
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
     <!-- iOS -->
     <None Include="..\..\output\native\ios\libSkiaSharp.framework\**" Link="nuget\runtimes\ios\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
-    <None Include="nuget\build\ios\SkiaSharp.targets" Link="nuget\build\net$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))-ios\SkiaSharp.targets" />
-    <None Include="nuget\build\ios\SkiaSharp.Local.targets" Link="nuget\build\net$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))-ios\SkiaSharp.Local.targets" />
+    <None Include="..\..\output\native\iossimulator\libSkiaSharp.framework\**" Link="nuget\runtimes\iossimulator\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="nuget\build\ios\SkiaSharp.targets" Link="nuget\build\net6.0-ios\SkiaSharp.targets" />
+    <None Include="nuget\build\ios\SkiaSharp.Local.targets" Link="nuget\build\net6.0-ios\SkiaSharp.Local.targets" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
     <!-- Mac Catalyst -->

diff --git a/binding/SkiaSharp/nuget/build/ios/SkiaSharp.Local.targets b/binding/SkiaSharp/nuget/build/ios/SkiaSharp.Local.targets
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <ItemGroup>
-        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libSkiaSharp.framework" Kind="Framework" />
+    <ItemGroup Condition="'$(RuntimeIdentifier)' != ''">
+        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\iossimulator\native\libSkiaSharp.framework" Kind="Framework" Condition="$(RuntimeIdentifier.StartsWith('iossimulator'))" />
+        <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libSkiaSharp.framework" Kind="Framework" Condition="!$(RuntimeIdentifier.StartsWith('iossimulator'))" />
     </ItemGroup>
 
 </Project>
diff --git a/cake/xcode.cake b/cake/xcode.cake
@@ -1,6 +1,6 @@
 #addin nuget:?package=Cake.XCode&version=5.0.0
 
-void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, string platform = null, Dictionary<string, string> properties = null)
+void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, Dictionary<string, string> properties = null)
 {
     var dir = project.GetDirectory();
 
@@ -18,9 +18,6 @@ void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, str
             { "BUILD_LIBRARIES_FOR_DISTRIBUTION", "YES" },
         },
     };
-    if (platform != null) {
-        settings.BuildSettings["PLATFORM"] = platform;
-    }
     if (properties != null) {
         foreach (var prop in properties) {
             settings.BuildSettings[prop.Key] = prop.Value;

diff --git a/externals/skia b/externals/skia
diff --git a/native/ios/build.cake b/native/ios/build.cake
@@ -5,9 +5,6 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native"));
 #load "../../cake/xcode.cake"
 
 string VARIANT = (BUILD_VARIANT ?? "ios").ToLower();
-string DEPLOYMENT_SDK = VARIANT == "maccatalyst" ? "[sdk=macosx*]" : "";
-
-DirectoryPath OUTPUT_VARIANT_PATH = OUTPUT_PATH.Combine(VARIANT);
 
 string GetDeploymentTarget(string arch)
 {
@@ -24,24 +21,38 @@ Task("libSkiaSharp")
 {
     if (VARIANT == "ios") {
         Build("iphonesimulator", "x86_64", "x64");
+        Build("iphonesimulator", "arm64", "arm64");
         Build("iphoneos", "arm64", "arm64");
+        Build("iphoneos", "arm64", "arm64", "arm64e");
+
+        SafeCopy(
+            $"libSkiaSharp/bin/{CONFIGURATION}/iphonesimulator/x86_64.xcarchive",
+            OUTPUT_PATH.Combine($"ios/libSkiaSharp/x86_64.xcarchive"));
 
-        CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libSkiaSharp"));
+        CreateFatFramework(OUTPUT_PATH.Combine("ios/libSkiaSharp"));
+        CreateFatFramework(OUTPUT_PATH.Combine("iossimulator/libSkiaSharp"));
     } else if (VARIANT == "maccatalyst") {
         Build("macosx", "x86_64", "x64");
         Build("macosx", "arm64", "arm64");
 
-        CreateFatVersionedFramework(OUTPUT_VARIANT_PATH.Combine("libSkiaSharp"));
+        CreateFatVersionedFramework(OUTPUT_PATH.Combine("maccatalyst/libSkiaSharp"));
     }
 
-    void Build(string sdk, string arch, string skiaArch)
+    void Build(string sdk, string arch, string skiaArch, string xcodeArch = null)
     {
         if (Skip(arch)) return;
 
-        GnNinja($"{VARIANT}/{arch}", "skia modules/skottie",
+        xcodeArch = xcodeArch ?? arch;
+        var isSim = sdk.EndsWith("simulator");
+        var platform = VARIANT;
+        if (VARIANT == "ios" && isSim)
+            platform += "simulator";
+
+        GnNinja($"{platform}/{xcodeArch}", "skia modules/skottie",
             $"target_cpu='{skiaArch}' " +
             $"target_os='{VARIANT}' " +
             $"min_{VARIANT}_version='{GetDeploymentTarget(arch)}' " +
+            $"ios_use_simulator={(isSim ? "true" : "false")} " +
             $"skia_use_icu=false " +
             $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " +
             $"skia_use_piex=true " +
@@ -55,13 +66,14 @@ Task("libSkiaSharp")
             $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] " +
             ADDITIONAL_GN_ARGS);
 
-        RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, platform: VARIANT, properties: new Dictionary<string, string> {
-            { $"IPHONEOS_DEPLOYMENT_TARGET{DEPLOYMENT_SDK}", GetDeploymentTarget(arch) },
+        RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, xcodeArch, properties: new Dictionary<string, string> {
+            { $"{VARIANT.ToUpper()}_DEPLOYMENT_TARGET_VERSION", GetDeploymentTarget(arch) },
+            { $"SKIA_PLATFORM", platform },
         });
 
         SafeCopy(
-            $"libSkiaSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive",
-            OUTPUT_PATH.Combine($"{VARIANT}/libSkiaSharp/{arch}.xcarchive"));
+            $"libSkiaSharp/bin/{CONFIGURATION}/{sdk}/{xcodeArch}.xcarchive",
+            OUTPUT_PATH.Combine($"{platform}/libSkiaSharp/{xcodeArch}.xcarchive"));
     }
 });
 
@@ -71,27 +83,40 @@ Task("libHarfBuzzSharp")
 {
     if (VARIANT == "ios") {
         Build("iphonesimulator", "x86_64");
+        Build("iphonesimulator", "arm64");
         Build("iphoneos", "arm64");
+        Build("iphoneos", "arm64e");
 
-        CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libHarfBuzzSharp"));
+        SafeCopy(
+            $"libHarfBuzzSharp/bin/{CONFIGURATION}/iphonesimulator/x86_64.xcarchive",
+            OUTPUT_PATH.Combine($"ios/libHarfBuzzSharp/x86_64.xcarchive"));
+
+        CreateFatFramework(OUTPUT_PATH.Combine("ios/libHarfBuzzSharp"));
+        CreateFatFramework(OUTPUT_PATH.Combine("iossimulator/libHarfBuzzSharp"));
     } else if (VARIANT == "maccatalyst") {
         Build("macosx", "x86_64");
         Build("macosx", "arm64");
 
-        CreateFatVersionedFramework(OUTPUT_VARIANT_PATH.Combine("libHarfBuzzSharp"));
+        CreateFatVersionedFramework(OUTPUT_PATH.Combine("maccatalyst/libHarfBuzzSharp"));
     }
 
-    void Build(string sdk, string arch)
+    void Build(string sdk, string arch, string xcodeArch = null)
     {
         if (Skip(arch)) return;
 
-        RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch, platform: VARIANT, properties: new Dictionary<string, string> {
-            { $"IPHONEOS_DEPLOYMENT_TARGET{DEPLOYMENT_SDK}", GetDeploymentTarget(arch) },
+        xcodeArch = xcodeArch ?? arch;
+        var isSim = sdk.EndsWith("simulator");
+        var platform = VARIANT;
+        if (VARIANT == "ios" && isSim)
+            platform += "simulator";
+
+        RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, xcodeArch, properties: new Dictionary<string, string> {
+            { $"{VARIANT.ToUpper()}_DEPLOYMENT_TARGET_VERSION", GetDeploymentTarget(arch) },
         });
 
         SafeCopy(
-            $"libHarfBuzzSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive",
-            OUTPUT_PATH.Combine($"{VARIANT}/libHarfBuzzSharp/{arch}.xcarchive"));
+            $"libHarfBuzzSharp/bin/{CONFIGURATION}/{sdk}/{xcodeArch}.xcarchive",
+            OUTPUT_PATH.Combine($"{platform}/libHarfBuzzSharp/{xcodeArch}.xcarchive"));
     }
 });
 

diff --git a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
@@ -399,7 +399,8 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = libHarfBuzzSharp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0;
+				"IPHONEOS_DEPLOYMENT_TARGET" = "$(IOS_DEPLOYMENT_TARGET_VERSION)";
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = "$(MACCATALYST_DEPLOYMENT_TARGET_VERSION)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -428,7 +429,8 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = libHarfBuzzSharp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0;
+				"IPHONEOS_DEPLOYMENT_TARGET" = "$(IOS_DEPLOYMENT_TARGET_VERSION)";
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = "$(MACCATALYST_DEPLOYMENT_TARGET_VERSION)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -493,11 +495,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IOS_DEPLOYMENT_TARGET_VERSION = 8.0;
+				MACCATALYST_DEPLOYMENT_TARGET_VERSION = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-all_load";
-				PLATFORM = ios;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -553,10 +555,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IOS_DEPLOYMENT_TARGET_VERSION = 8.0;
+				MACCATALYST_DEPLOYMENT_TARGET_VERSION = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-all_load";
-				PLATFORM = ios;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

diff --git a/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj b/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj
@@ -315,12 +315,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IOS_DEPLOYMENT_TARGET_VERSION = 8.0;
+				MACCATALYST_DEPLOYMENT_TARGET_VERSION = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-all_load";
 				SDKROOT = iphoneos;
-				PLATFORM = ios;
+				SKIA_PLATFORM = ios;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -388,11 +389,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IOS_DEPLOYMENT_TARGET_VERSION = 8.0;
+				MACCATALYST_DEPLOYMENT_TARGET_VERSION = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-all_load";
 				SDKROOT = iphoneos;
-				PLATFORM = ios;
+				SKIA_PLATFORM = ios;
 				VALIDATE_PRODUCT = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -412,9 +414,10 @@
 				HEADER_SEARCH_PATHS = ../../../externals/skia;
 				INFOPLIST_FILE = libSkiaSharp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0;
+				"IPHONEOS_DEPLOYMENT_TARGET" = "$(IOS_DEPLOYMENT_TARGET_VERSION)";
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = "$(MACCATALYST_DEPLOYMENT_TARGET_VERSION)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "../../../externals/skia/out/$(PLATFORM)/$(ARCHS)";
+				LIBRARY_SEARCH_PATHS = "../../../externals/skia/out/$(SKIA_PLATFORM)/$(ARCHS)";
 				OTHER_LDFLAGS = (
 					"-all_load",
 					"-lskia",
@@ -442,9 +445,10 @@
 				HEADER_SEARCH_PATHS = ../../../externals/skia;
 				INFOPLIST_FILE = libSkiaSharp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0;
+				"IPHONEOS_DEPLOYMENT_TARGET" = "$(IOS_DEPLOYMENT_TARGET_VERSION)";
+				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = "$(MACCATALYST_DEPLOYMENT_TARGET_VERSION)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "../../../externals/skia/out/$(PLATFORM)/$(ARCHS)";
+				LIBRARY_SEARCH_PATHS = "../../../externals/skia/out/$(SKIA_PLATFORM)/$(ARCHS)";
 				OTHER_LDFLAGS = (
 					"-all_load",
 					"-lskia",
+15 −3		gn/BUILD.gn
+4 −0		gn/BUILDCONFIG.gn
+1 −1		gn/ios.gni