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] 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