Fix code-sign target failures on TravisCI

Author: natemcmaster

.appveyor.yml

@@ -1,6 +1,6 @@
 version: 2.2.5.{build}
 build_script:
-  - ps: .\build.ps1 -IsOfficialBuild
+  - ps: .\build.ps1 -ci
   - ps: .\docs\generate.ps1 -NoBuild -Verbose
 environment:
   KEYVAULT_CLIENT_SECRET:

Directory.Build.props

@@ -26,7 +26,7 @@
     <AzureKeyVaultClientId>6a27a2da-bb78-4baa-bd2b-150fe89ea039</AzureKeyVaultClientId>
     <AzureKeyVaultClientSecret>$(KEYVAULT_CLIENT_SECRET)</AzureKeyVaultClientSecret>
     <CodeSignCertName>DigiCertCodeSign</CodeSignCertName>
-    <CodeSign Condition=" '$(CI)' == 'true' ">true</CodeSign>
+    <CodeSign>false</CodeSign>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateFullPaths Condition="'$(VSCODE_PID)' != ''">true</GenerateFullPaths>

build.ps1

@@ -4,7 +4,9 @@ param(
     [ValidateSet('Debug', 'Release')]
     $Configuration = $null,
     [switch]
-    $IsOfficialBuild,
+    $ci,
+    [switch]
+    $sign,
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$MSBuildArgs
 )
@@ -18,40 +20,44 @@ Import-Module -Force -Scope Local "$PSScriptRoot/src/common.psm1"
 # Main
 #
 
+if ($env:CI -eq 'true') {
+    $ci = $true
+}
+
 if (!$Configuration) {
-    $Configuration = if ($env:CI -or $IsOfficialBuild) { 'Release' } else { 'Debug' }
+    $Configuration = if ($ci) { 'Release' } else { 'Debug' }
 }
 
-if ($IsOfficialBuild) {
+if ($ci) {
     $MSBuildArgs += '-p:CI=true'
+}
 
-    $CodeSign = -not $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and ($IsWindows -or -not $IsCoreCLR)
-
-    if ($CodeSign) {
-        $astDir = "$PSScriptRoot/.build/tools/store/AzureSignTool/1.0.1/"
-        $AzureSignToolPath = "$astDir/AzureSignTool.exe"
-        if (-not (Test-Path $AzureSignToolPath)) {
-            New-Item $astDir -ItemType Directory -ErrorAction Ignore | Out-Null
-            Invoke-WebRequest https://github.com/vcsjones/AzureSignTool/releases/download/1.0.1/AzureSignTool.zip `
-                -OutFile "$astDir/AzureSignTool.zip"
-            Expand-Archive "$astDir/AzureSignTool.zip" -DestinationPath $astDir
-        }
-
-        $nstDir = "$PSScriptRoot/.build/tools/store/NuGetKeyVaultSignTool/1.1.4/"
-        $NuGetKeyVaultSignTool = "$nstDir/tools/net471/NuGetKeyVaultSignTool.exe"
-        if (-not (Test-Path $NuGetKeyVaultSignTool)) {
-            New-Item $nstDir -ItemType Directory -ErrorAction Ignore | Out-Null
-            Invoke-WebRequest https://github.com/onovotny/NuGetKeyVaultSignTool/releases/download/v1.1.4/NuGetKeyVaultSignTool.1.1.4.nupkg `
-                -OutFile "$nstDir/NuGetKeyVaultSignTool.zip"
-            Expand-Archive "$nstDir/NuGetKeyVaultSignTool.zip" -DestinationPath $nstDir
-        }
+$CodeSign = $sign -or ($ci -and -not $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and ($IsWindows -or -not $IsCoreCLR))
 
-        $MSBuildArgs += "-p:AzureSignToolPath=$AzureSignToolPath"
-        $MSBuildArgs += "-p:NuGetKeyVaultSignTool=$NuGetKeyVaultSignTool"
+if ($CodeSign) {
+    $astDir = "$PSScriptRoot/.build/tools/store/AzureSignTool/1.0.1/"
+    $AzureSignToolPath = "$astDir/AzureSignTool.exe"
+    if (-not (Test-Path $AzureSignToolPath)) {
+        New-Item $astDir -ItemType Directory -ErrorAction Ignore | Out-Null
+        Invoke-WebRequest https://github.com/vcsjones/AzureSignTool/releases/download/1.0.1/AzureSignTool.zip `
+            -OutFile "$astDir/AzureSignTool.zip"
+        Expand-Archive "$astDir/AzureSignTool.zip" -DestinationPath $astDir
     }
-    else {
-        $MSBuildArgs += '-p:CodeSign=false'
+
+    $nstDir = "$PSScriptRoot/.build/tools/store/NuGetKeyVaultSignTool/1.1.4/"
+    $NuGetKeyVaultSignTool = "$nstDir/tools/net471/NuGetKeyVaultSignTool.exe"
+    if (-not (Test-Path $NuGetKeyVaultSignTool)) {
+        New-Item $nstDir -ItemType Directory -ErrorAction Ignore | Out-Null
+        Invoke-WebRequest https://github.com/onovotny/NuGetKeyVaultSignTool/releases/download/v1.1.4/NuGetKeyVaultSignTool.1.1.4.nupkg `
+            -OutFile "$nstDir/NuGetKeyVaultSignTool.zip"
+        Expand-Archive "$nstDir/NuGetKeyVaultSignTool.zip" -DestinationPath $nstDir
     }
+
+    $MSBuildArgs += "-p:AzureSignToolPath=$AzureSignToolPath"
+    $MSBuildArgs += "-p:NuGetKeyVaultSignTool=$NuGetKeyVaultSignTool"
+}
+else {
+    $MSBuildArgs += '-p:CodeSign=false'
 }
 
 $artifacts = "$PSScriptRoot/artifacts/"