From 5ff7a0a4f821be29b777b181cdba643b01c7e0f3 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 8 Sep 2018 21:29:10 +0100
Subject: [PATCH 1/2] Remove code signing clutter

---
 openrct2.proj                   | 31 -------------------------------
 scripts/ps/appveyor_install.ps1 | 13 -------------
 2 files changed, 44 deletions(-)

diff --git a/openrct2.proj b/openrct2.proj
index a492b7ff48..68163ea855 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -6,7 +6,6 @@
        - GIT_BRANCH
        - GIT_COMMIT_SHA1
        - GIT_DESCRIBE
-       - SIGN_PASSWORD
        - OPENRCT2_ORG_TOKEN
        - NO_NSIS: set to true to prevent the NSIS installer building
   -->
@@ -44,9 +43,6 @@
     <OutputDll>$(TargetDir)openrct2.dll</OutputDll>
     <g2Output>$(TargetDir)data\g2.dat</g2Output>
 
-    <SignCertificate Condition="'$(SignCertificate)'==''">$(DistDir)windows\code-sign-key-openrct2.org.pfx</SignCertificate>
-    <SignTimestampUrl>http://timestamp.comodoca.com/authenticode</SignTimestampUrl>
-
     <PublishPostfix>-$(Configuration)-$(Platform)</PublishPostfix>
     <PublishPostfix Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(PublishPostfix)-$(GIT_COMMIT_SHA1_SHORT)</PublishPostfix>
     <PublishPostfix>$(PublishPostfix.ToLower())</PublishPostfix>
@@ -80,9 +76,6 @@
 
   <ItemGroup>
     <g2Inputs Include="$(RootDir)resources\g2\*" />
-    <SignItems Include="$(OutputExe)" />
-    <SignItems Include="$(OutputCom)" />
-    <SignItems Include="$(OutputDll)" />
   </ItemGroup>
 
   <ItemGroup Label="Symbol Items">
@@ -155,7 +148,6 @@
       <CleanItems Include="$(ArtifactsDir)openrct2-symbols-$(Configuration)-$(Platform)*.zip" />
     </ItemGroup>
     <Delete Files="@(CleanItems)" />
-    <Delete Files="%(SignItems.Identity).signed" />
     <RemoveDir Directories="$(TargetDir)data" />
     <MSBuild Projects="openrct2.sln" Targets="Clean" Properties="$(SlnProperties)" />
   </Target>
@@ -234,21 +226,6 @@
                         OutputDirectory="$(TargetDir)data\object" />
   </Target>
 
-  <!-- Target to sign OpenRCT2
-       This requires the project parameter SIGN_PASSWORD to be set -->
-  <Target Name="Sign" AfterTargets="Build" Inputs="@(SignItems)" Outputs="%(SignItems.Identity).signed"
-          Condition="'$(TestConfig)'!='true'">
-    <!-- <Warning Condition="'$(SIGN_PASSWORD)'==''" Text="SIGN_PASSWORD was not set, skipping signing of %(SignItems.Filename)%(SignItems.Extension)." /> -->
-    <Message Condition="'$(SIGN_PASSWORD)'!=''" Text="Signing %(SignItems.Filename)%(SignItems.Extension)"
-             Importance="high" />
-    <Exec EchoOff="true" Condition="'$(SIGN_PASSWORD)'!=''"
-          Command="signtool.exe sign /f $(SignCertificate) /p $(SIGN_PASSWORD) /t $(SignTimestampUrl) %(SignItems.Identity)"
-          StandardOutputImportance="low" />
-
-    <!-- Create a dummy file so that msbuild can use it to determine if the binary is newer than the last sign time -->
-    <Touch AlwaysCreate="true" Files="%(SignItems.Identity).signed" />
-  </Target>
-
   <!-- Target to publish OpenRCT2 as a portable zip -->
   <Target Name="PublishPortable" DependsOnTargets="Build;g2" Inputs="@(PublishItems)" Outputs="$(PublishZip)"
           Condition="'$(TestConfig)'!='true'">
@@ -285,14 +262,6 @@
          /DPLATFORM=$(Platform) ^
          $(NsisScript)"
           StandardOutputImportance="normal" />
-
-    <!-- Sign the installer -->
-    <!-- <Warning Condition="'$(SIGN_PASSWORD)'==''" Text="SIGN_PASSWORD was not set, skipping signing of $(PublishInstallerExeName)." /> -->
-    <Message Condition="'$(SIGN_PASSWORD)'!=''" Text="Signing $(PublishInstallerExeName)"
-             Importance="high" />
-    <Exec EchoOff="true" Condition="'$(SIGN_PASSWORD)'!=''"
-          Command="signtool.exe sign /f $(SignCertificate) /p $(SIGN_PASSWORD) /t $(SignTimestampUrl) $(PublishInstallerExe)"
-          StandardOutputImportance="low" />
   </Target>
 
   <Target Name="PublishAll"
diff --git a/scripts/ps/appveyor_install.ps1 b/scripts/ps/appveyor_install.ps1
index 077a90647b..cc24dd8d2c 100644
--- a/scripts/ps/appveyor_install.ps1
+++ b/scripts/ps/appveyor_install.ps1
@@ -12,19 +12,6 @@ function Check-ExitCode
     }
 }
 
-if ($env:ENCKEY -and -not $testing)
-{
-    if (-not (Test-Path "secure-file"))
-    {
-        Write-Host "Downloading secure-file from NuGet..." -ForegroundColor Cyan
-        nuget install secure-file -ExcludeVersion
-    }
-    
-    Write-Host "Decrypting code signing key..."            -ForegroundColor Cyan
-    secure-file\tools\secure-file -decrypt distribution\windows\code-sign-key-openrct2.org.pfx.enc -secret $env:ENCKEY
-    Check-ExitCode
-}
-
 # Check if OpenRCT2.org API security token is available
 if (${env:OPENRCT2_ORG_TOKEN} -and -not $testing)
 {

From 56444e6870348db3425f0538f137e9a0c78bde6a Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 8 Sep 2018 21:32:05 +0100
Subject: [PATCH 2/2] Remove build dependency for g2 target

The reason for removing this is so that running the g2 target does not cause a build when it isn't necessary such as if the build is out of date or there is a platform or configuration mismatch.
---
 openrct2.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openrct2.proj b/openrct2.proj
index 68163ea855..2697ca02c3 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -194,7 +194,7 @@
   </Target>
 
   <!-- Target to build g2.dat containing OpenRCT2 sprites -->
-  <Target Name="g2" DependsOnTargets="Build" AfterTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)"
+  <Target Name="g2" AfterTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)"
           Condition="'$(TestConfig)'!='true'">
     <Message Text="Building g2.dat..." Importance="high" />
     <Exec Command="&quot;$(OutputExe)&quot; sprite build &quot;$(g2Output)&quot; &quot;$(RootDir)resources\g2\sprites.json&quot;"