From 46acb00c24d0471640dd3edea9c256d446ead321 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 17:04:50 +0200
Subject: [PATCH 1/7] Ensure that the assemblies are in fact signed

Fixes #1267
---
 VERSIONS.txt                   | 36 +++++++++++++++++-----------------
 scripts/azure-pipelines.yml    |  2 +-
 source/SkiaSharp.Build.targets | 15 ++++++++++++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/VERSIONS.txt b/VERSIONS.txt
index 2b5f6dbd07..90cacac48b 100644
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -28,26 +28,26 @@ HarfBuzz                soname      0.20601.0
 
 # SkiaSharp.dll
 SkiaSharp               assembly    1.68.0.0
-SkiaSharp               file        1.68.2.0
+SkiaSharp               file        1.68.2.1
 
 # HarfBuzzSharp.dll
 HarfBuzzSharp           assembly    1.0.0.0
-HarfBuzzSharp           file        2.6.1.2
+HarfBuzzSharp           file        2.6.1.3
 
 # nuget versions
-SkiaSharp                                       nuget       1.68.2
-SkiaSharp.NativeAssets.Linux                    nuget       1.68.2
-SkiaSharp.NativeAssets.Linux.NoDependencies     nuget       1.68.2
-SkiaSharp.NativeAssets.NanoServer               nuget       1.68.2
-SkiaSharp.Views                                 nuget       1.68.2
-SkiaSharp.Views.Desktop.Common                  nuget       1.68.2
-SkiaSharp.Views.Gtk2                            nuget       1.68.2
-SkiaSharp.Views.Gtk3                            nuget       1.68.2
-SkiaSharp.Views.WindowsForms                    nuget       1.68.2
-SkiaSharp.Views.WPF                             nuget       1.68.2
-SkiaSharp.Views.Forms                           nuget       1.68.2
-SkiaSharp.Views.Forms.WPF                       nuget       1.68.2
-SkiaSharp.Views.Forms.GTK                       nuget       1.68.2
-SkiaSharp.HarfBuzz                              nuget       1.68.2
-HarfBuzzSharp                                   nuget       2.6.1.2
-HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1.2
+SkiaSharp                                       nuget       1.68.2.1
+SkiaSharp.NativeAssets.Linux                    nuget       1.68.2.1
+SkiaSharp.NativeAssets.Linux.NoDependencies     nuget       1.68.2.1
+SkiaSharp.NativeAssets.NanoServer               nuget       1.68.2.1
+SkiaSharp.Views                                 nuget       1.68.2.1
+SkiaSharp.Views.Desktop.Common                  nuget       1.68.2.1
+SkiaSharp.Views.Gtk2                            nuget       1.68.2.1
+SkiaSharp.Views.Gtk3                            nuget       1.68.2.1
+SkiaSharp.Views.WindowsForms                    nuget       1.68.2.1
+SkiaSharp.Views.WPF                             nuget       1.68.2.1
+SkiaSharp.Views.Forms                           nuget       1.68.2.1
+SkiaSharp.Views.Forms.WPF                       nuget       1.68.2.1
+SkiaSharp.Views.Forms.GTK                       nuget       1.68.2.1
+SkiaSharp.HarfBuzz                              nuget       1.68.2.1
+HarfBuzzSharp                                   nuget       2.6.1.3
+HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1.3
diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index fe8e3fbebf..8c5de4af2f 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -10,7 +10,7 @@ pr:
   - patch/*
 
 variables:
-  SKIASHARP_VERSION: 1.68.2
+  SKIASHARP_VERSION: 1.68.2.1
   FEATURE_NAME_PREFIX: 'feature/'
   VERBOSITY: normal
   GIT_SHA: $(Build.SourceVersion)
diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
index ce0f1e01e0..7187222680 100644
--- a/source/SkiaSharp.Build.targets
+++ b/source/SkiaSharp.Build.targets
@@ -6,7 +6,7 @@
     <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/bin/mono') ">/usr/bin/mono</_ManagedExeLauncher>
     <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And '$(_ManagedExeLauncher)' == '' ">mono</_ManagedExeLauncher>
 
-    <PublicSign Condition=" '$(PublicSign)' == '' and '$(SignAssembly)' == 'true' and '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PublicSign Condition=" '$(PublicSign)' == '' and '$(SignAssembly)' == 'true' ">true</PublicSign>
     <KeyFileName Condition=" '$(KeyFileName)' == '' ">mono.snk</KeyFileName>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\$(KeyFileName)</AssemblyOriginatorKeyFile>
 
@@ -90,10 +90,21 @@
     Sign the assembly using sn.
     ===================================================================================================================
   -->
-  <Target Name="_SignAssembly" AfterTargets="CoreCompile" Condition=" '$(IsWindows)' != 'true' and '$(SignAssembly)' == 'true' ">
+  <Target Name="_SignAssembly" AfterTargets="CoreCompile" DependsOnTargets="_RedirectMovedTypes" Condition=" '$(SignAssembly)' == 'true' ">
     <Exec Command="sn -q -R @(IntermediateAssembly -> '&quot;%(Identity)&quot;') &quot;$(AssemblyOriginatorKeyFile)&quot;" />
   </Target>
 
+  <!--
+    ===================================================================================================================
+    _SignAssemblyVerify
+
+    Verify that the output assembly is signed correctly for release.
+    ===================================================================================================================
+  -->
+  <Target Name="_SignAssemblyVerify" AfterTargets="Build" Condition=" '$(SignAssembly)' == 'true' and '$(Configuration)' == 'Release' and '$(TargetPath)' != '' ">
+    <Exec Command="sn -vf &quot;$(TargetPath)&quot;" />
+  </Target>
+
   <!--
     ===================================================================================================================
     _CheckSkiaSharpBuildPropsImported

From 7c95773333ab755fbf509c9bc1b845938fd946d3 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 21:19:09 +0200
Subject: [PATCH 2/7] Sometimes the path does not exist?

---
 scripts/azure-templates-bootstrapper.yml | 20 ++++++++++----------
 source/SkiaSharp.Build.targets           |  8 ++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
index a27747f768..6449043aef 100644
--- a/scripts/azure-templates-bootstrapper.yml
+++ b/scripts/azure-templates-bootstrapper.yml
@@ -14,21 +14,21 @@ parameters:
   condition: succeeded()                        # whether or not to run this template
   shouldPublish: true                           # whether or not to publish the artifacts
   configuration: $(CONFIGURATION)               # the build configuration
-  buildExternals: ''                            # the build number to download externals from
+  buildExternals: '3688818'                            # the build number to download externals from
   verbosity: $(VERBOSITY)                       # the level of verbosity to use when building
   docker: ''                                    # the Docker image to build and use
 
 jobs:
-# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
-#   - template: azure-templates-download.yml
-#     parameters:
-#       name: ${{ parameters.name }}
-#       displayName: ${{ parameters.displayName }}
-#       vmImage: ${{ parameters.vmImage }}
-#       condition: ${{ parameters.condition }}
-#       buildExternals: ${{ parameters.buildExternals }}
+- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
+  - template: azure-templates-download.yml
+    parameters:
+      name: ${{ parameters.name }}
+      displayName: ${{ parameters.displayName }}
+      vmImage: ${{ parameters.vmImage }}
+      condition: ${{ parameters.condition }}
+      buildExternals: ${{ parameters.buildExternals }}
 
-# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
+- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 120
diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
index 7187222680..094c4435ae 100644
--- a/source/SkiaSharp.Build.targets
+++ b/source/SkiaSharp.Build.targets
@@ -6,6 +6,10 @@
     <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/bin/mono') ">/usr/bin/mono</_ManagedExeLauncher>
     <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And '$(_ManagedExeLauncher)' == '' ">mono</_ManagedExeLauncher>
 
+    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' And '$(_SnExePath)' == '' and '$(WindowsSDK_ExecutablePath_x86)' != '' ">$(WindowsSDK_ExecutablePath_x86)sn.exe</_SnExePath>
+    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' And '$(_SnExePath)' == '' and '$(WindowsSDK_ExecutablePath_x64)' != '' ">$(WindowsSDK_ExecutablePath_x64)sn.exe</_SnExePath>
+    <_SnExePath Condition=" '$(_SnExePath)' == '' ">sn</_SnExePath>
+
     <PublicSign Condition=" '$(PublicSign)' == '' and '$(SignAssembly)' == 'true' ">true</PublicSign>
     <KeyFileName Condition=" '$(KeyFileName)' == '' ">mono.snk</KeyFileName>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\$(KeyFileName)</AssemblyOriginatorKeyFile>
@@ -91,7 +95,7 @@
     ===================================================================================================================
   -->
   <Target Name="_SignAssembly" AfterTargets="CoreCompile" DependsOnTargets="_RedirectMovedTypes" Condition=" '$(SignAssembly)' == 'true' ">
-    <Exec Command="sn -q -R @(IntermediateAssembly -> '&quot;%(Identity)&quot;') &quot;$(AssemblyOriginatorKeyFile)&quot;" />
+    <Exec Command="&quot;$(_SnExePath)&quot; -q -R @(IntermediateAssembly -> '&quot;%(Identity)&quot;') &quot;$(AssemblyOriginatorKeyFile)&quot;" />
   </Target>
 
   <!--
@@ -102,7 +106,7 @@
     ===================================================================================================================
   -->
   <Target Name="_SignAssemblyVerify" AfterTargets="Build" Condition=" '$(SignAssembly)' == 'true' and '$(Configuration)' == 'Release' and '$(TargetPath)' != '' ">
-    <Exec Command="sn -vf &quot;$(TargetPath)&quot;" />
+    <Exec Command="&quot;$(_SnExePath)&quot; -vf &quot;$(TargetPath)&quot;" />
   </Target>
 
   <!--

From 9d2275869739d28dbc411a98fe3c6bbb70fa7329 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 21:34:58 +0200
Subject: [PATCH 3/7] Add /bl

---
 build.cake        | 10 +++++++---
 cake/msbuild.cake | 10 +++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.cake b/build.cake
index 9d897d959e..600e5f0fe1 100644
--- a/build.cake
+++ b/build.cake
@@ -119,7 +119,8 @@ Task ("libs")
             platform = ".Linux";
         }
     }
-    RunMSBuild ($"./source/SkiaSharpSource{platform}.sln");
+    RunMSBuild ($"./source/SkiaSharpSource{platform}.sln",
+        bl: $"./output/binlogs/libs{platform}.binlog");
 
     // assemble the mdoc docs
     EnsureDirectoryExists ("./output/docs/mdoc/");
@@ -142,7 +143,9 @@ Task ("tests")
 
     void RunDesktopTest (string arch)
     {
-        RunMSBuild ("./tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln", platform: arch == "AnyCPU" ? "Any CPU" : arch);
+        RunMSBuild ("./tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln",
+            platform: arch == "AnyCPU" ? "Any CPU" : arch,
+            bl: $"./output/binlogs/tests-desktop.{arch}.binlog");
         try {
             RunTests ($"./tests/SkiaSharp.Desktop.Tests/bin/{arch}/{CONFIGURATION}/SkiaSharp.Tests.dll", arch == "x86");
         } catch {
@@ -164,7 +167,8 @@ Task ("tests")
     }
 
     // .NET Core
-    RunMSBuild ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.sln");
+    RunMSBuild ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.sln",
+        bl: $"./output/binlogs/tests-netcore.binlog");
     try {
         RunNetCoreTests ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj");
     } catch {
diff --git a/cake/msbuild.cake b/cake/msbuild.cake
index 700c912341..156d347e84 100644
--- a/cake/msbuild.cake
+++ b/cake/msbuild.cake
@@ -6,7 +6,8 @@ void RunMSBuild(
     string platform = "Any CPU",
     string platformTarget = null,
     bool restore = true,
-    bool restoreOnly = false)
+    bool restoreOnly = false,
+    string bl = null)
 {
     var nugetSources = new [] { OUTPUT_NUGETS_PATH.FullPath, "https://api.nuget.org/v3/index.json" };
 
@@ -17,6 +18,13 @@ void RunMSBuild(
         c.Verbosity = VERBOSITY;
         c.MaxCpuCount = 0;
 
+        if (!string.IsNullOrEmpty(bl)) {
+            c.BinaryLogger = new MSBuildBinaryLogSettings {
+                Enabled = true,
+                FileName = bl,
+            };
+        }
+
         if (!string.IsNullOrEmpty(MSBUILD_EXE)) {
             c.ToolPath = MSBUILD_EXE;
         } else if (IsRunningOnWindows() && !string.IsNullOrEmpty(VS_INSTALL)) {

From 68e75584df65fa8446ec6dae95c95bbc717d2abf Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 21:56:05 +0200
Subject: [PATCH 4/7] Use a better path

---
 source/SkiaSharp.Build.targets | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
index 094c4435ae..edacbfe14f 100644
--- a/source/SkiaSharp.Build.targets
+++ b/source/SkiaSharp.Build.targets
@@ -1,13 +1,12 @@
 <Project>
 
   <PropertyGroup>
-    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono</_ManagedExeLauncher>
-    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/local/bin/mono') ">/usr/local/bin/mono</_ManagedExeLauncher>
-    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/bin/mono') ">/usr/bin/mono</_ManagedExeLauncher>
-    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And '$(_ManagedExeLauncher)' == '' ">mono</_ManagedExeLauncher>
+    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono</_ManagedExeLauncher>
+    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/usr/local/bin/mono') ">/usr/local/bin/mono</_ManagedExeLauncher>
+    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/usr/bin/mono') ">/usr/bin/mono</_ManagedExeLauncher>
+    <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and '$(_ManagedExeLauncher)' == '' ">mono</_ManagedExeLauncher>
 
-    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' And '$(_SnExePath)' == '' and '$(WindowsSDK_ExecutablePath_x86)' != '' ">$(WindowsSDK_ExecutablePath_x86)sn.exe</_SnExePath>
-    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' And '$(_SnExePath)' == '' and '$(WindowsSDK_ExecutablePath_x64)' != '' ">$(WindowsSDK_ExecutablePath_x64)sn.exe</_SnExePath>
+    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' and '$(_SnExePath)' == '' and Exists('$(SDK40ToolsPath)sn.exe') ">$(SDK40ToolsPath)sn.exe</_SnExePath>
     <_SnExePath Condition=" '$(_SnExePath)' == '' ">sn</_SnExePath>
 
     <PublicSign Condition=" '$(PublicSign)' == '' and '$(SignAssembly)' == 'true' ">true</PublicSign>

From a66fdff9f82b2448345be575b149fe2f7cacb1ad Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 22:46:24 +0200
Subject: [PATCH 5/7] Fall back to a known path for .net core

---
 source/SkiaSharp.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
index edacbfe14f..5d6258da0e 100644
--- a/source/SkiaSharp.Build.targets
+++ b/source/SkiaSharp.Build.targets
@@ -7,6 +7,7 @@
     <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and '$(_ManagedExeLauncher)' == '' ">mono</_ManagedExeLauncher>
 
     <_SnExePath Condition=" '$(OS)' == 'Windows_NT' and '$(_SnExePath)' == '' and Exists('$(SDK40ToolsPath)sn.exe') ">$(SDK40ToolsPath)sn.exe</_SnExePath>
+    <_SnExePath Condition=" '$(OS)' == 'Windows_NT' and '$(_SnExePath)' == '' and Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe') ">$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe</_SnExePath>
     <_SnExePath Condition=" '$(_SnExePath)' == '' ">sn</_SnExePath>
 
     <PublicSign Condition=" '$(PublicSign)' == '' and '$(SignAssembly)' == 'true' ">true</PublicSign>

From cf98ede97301e0f59e912bfa00c73ceb7b058042 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 1 May 2020 23:24:22 +0200
Subject: [PATCH 6/7] For reals

---
 scripts/azure-templates-bootstrapper.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
index 6449043aef..a27747f768 100644
--- a/scripts/azure-templates-bootstrapper.yml
+++ b/scripts/azure-templates-bootstrapper.yml
@@ -14,21 +14,21 @@ parameters:
   condition: succeeded()                        # whether or not to run this template
   shouldPublish: true                           # whether or not to publish the artifacts
   configuration: $(CONFIGURATION)               # the build configuration
-  buildExternals: '3688818'                            # the build number to download externals from
+  buildExternals: ''                            # the build number to download externals from
   verbosity: $(VERBOSITY)                       # the level of verbosity to use when building
   docker: ''                                    # the Docker image to build and use
 
 jobs:
-- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
-  - template: azure-templates-download.yml
-    parameters:
-      name: ${{ parameters.name }}
-      displayName: ${{ parameters.displayName }}
-      vmImage: ${{ parameters.vmImage }}
-      condition: ${{ parameters.condition }}
-      buildExternals: ${{ parameters.buildExternals }}
+# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
+#   - template: azure-templates-download.yml
+#     parameters:
+#       name: ${{ parameters.name }}
+#       displayName: ${{ parameters.displayName }}
+#       vmImage: ${{ parameters.vmImage }}
+#       condition: ${{ parameters.condition }}
+#       buildExternals: ${{ parameters.buildExternals }}
 
-- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
+# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 120

From 7e6b36b325aea5a87b0aea692786aa6a8bc42c10 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 2 May 2020 02:08:19 +0200
Subject: [PATCH 7/7] Make sure the folder exists for CI

---
 cake/UpdateDocs.cake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake
index e275150404..c42d2332e7 100644
--- a/cake/UpdateDocs.cake
+++ b/cake/UpdateDocs.cake
@@ -76,6 +76,7 @@ Task ("docs-api-diff")
 
     // pretty version
     var diffDir = "./output/api-diff";
+    EnsureDirectoryExists (diffDir);
     CleanDirectories (diffDir);
 
     Information ($"Creating comparer...");