From f9f8ad935a30962d90109e49165aa49ce16e4111 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 27 Feb 2020 00:21:57 +0100
Subject: [PATCH 1/3] strong name all assemblies in repository

---
 Directory.Build.props                          | 3 ++-
 src/Directory.Build.props                      | 7 +++----
 tests/ImageSharp.Tests/AssemblyInfo.cs         | 6 ------
 tests/ImageSharp.Tests/ImageSharp.Tests.csproj | 1 +
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 tests/ImageSharp.Tests/AssemblyInfo.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index d0137e592..12a4a5c2a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -95,8 +95,9 @@
       <!-- Contains RemoteExecutor. Taken from: https://github.com/dotnet/runtime/blob/master/NuGet.config -->
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
     </RestoreSources>
-    <SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
+    <SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
     <UseSharedCompilation>true</UseSharedCompilation>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <!-- Package references and additional files which are consumed by all projects -->
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bcf444c75..bd6527da1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -28,10 +28,9 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
-    <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
-    <InternalsVisibleTo Include="ImageSharp.Benchmarks" />
-    <InternalsVisibleTo Include="SixLabors.ImageSharp.Sandbox46" />
-    <InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" />
+    <InternalsVisibleTo Include="ImageSharp.Benchmarks" PublicKey="$(SixLaborsPublicKey)" />
+    <InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" PublicKey="$(SixLaborsPublicKey)" />
+    <InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" PublicKey="$(SixLaborsPublicKey)" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/ImageSharp.Tests/AssemblyInfo.cs b/tests/ImageSharp.Tests/AssemblyInfo.cs
deleted file mode 100644
index 944fbe101..000000000
--- a/tests/ImageSharp.Tests/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.CompilerServices;
-
-[assembly:InternalsVisibleTo("ImageSharp.Tests.ProfilingSandbox")]
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 34cdca49a..fdb280ca9 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-xunit" />
+    <InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" PublicKey="$(SixLaborsPublicKey)" />
   </ItemGroup>
 
   <ItemGroup>

From e1e229036e778225e556eefd51aa69d0b81546ea Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 27 Feb 2020 01:23:53 +0100
Subject: [PATCH 2/3] workaround ImageSharp.Benchmarks issues

---
 .../ImageSharp.Benchmarks.csproj              | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
index 3cf0a7da3..f380d0a6a 100644
--- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
+++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -9,6 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
     <!--Used to hide test project from dotnet test-->
     <IsTestProject>false</IsTestProject>
+
+    <!-- Uncomment this to run benchmarks depending on Colorful or Pfim (colorspaces and TGA): -->
+    <!--<SignAssembly>false</SignAssembly>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,4 +28,21 @@
     <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
+  <!-- Exclude benchmarks using internals, in case of unsigned benchmark execution: -->
+  <ItemGroup Condition="'$(SignAssembly)' == 'false'">
+    <Compile Remove="Codecs\Jpeg\BlockOperations\**" />
+    <Compile Remove="Codecs\Jpeg\DoubleBufferedStreams.cs" />
+    <Compile Remove="Codecs\Jpeg\YCbCrColorConversion.cs" />
+    <Compile Remove="Codecs\Jpeg\DecodeJpegParseStreamOnly.cs" />
+    <Compile Remove="Color\Bulk\**" />
+    <Compile Remove="Color\RgbToYCbCr.cs" />
+    <Compile Remove="Color\YCbCrToRgb.cs" />
+    <Compile Remove="General\Vectorization\**" />
+    <Compile Remove="General\PixelConversion\**" />
+    <Compile Remove="General\BasicMath\ModuloPowerOfTwoConstant.cs" />
+    <Compile Remove="General\BasicMath\ModuloPowerOfTwoVariable.cs" />
+    <Compile Remove="PixelBlenders\**" />
+    <Compile Remove="Samplers\Resize.cs" />
+  </ItemGroup>
+
 </Project>

From 6d2afb3b08ca611eabee4d6624f72b56fadada4f Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Fri, 28 Feb 2020 15:06:59 +0100
Subject: [PATCH 3/3] Add comment for DynamicProxyGenAssembly2

---
 src/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bd6527da1..2c13e469f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -27,6 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- DynamicProxyGenAssembly2 is needed so Moq can use our internals -->
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
     <InternalsVisibleTo Include="ImageSharp.Benchmarks" PublicKey="$(SixLaborsPublicKey)" />
     <InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" PublicKey="$(SixLaborsPublicKey)" />