From 319ed14229b6d3c0405dc5657eee4f95475a49d6 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Tue, 26 Sep 2017 17:29:41 -0700
Subject: [PATCH] Fix SigningValidation (dotnet/core-setup#3240)

* Fix SigningValidation

* Delete unneccessary SigntType in pipeline.json forgotted to delete previously


Commit migrated from https://github.com/dotnet/core-setup/commit/80f1762d9ea68656fa3c1f369659a44c3a3c1017
---
 src/installer/buildpipeline/Core-Setup-Signing-Validation.json | 2 +-
 src/installer/buildpipeline/pipeline.json                      | 6 ++----
 src/installer/signing/signingvalidation.proj                   | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/installer/buildpipeline/Core-Setup-Signing-Validation.json b/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
index 7f909e3..4526e61 100644
--- a/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
+++ b/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
@@ -69,7 +69,7 @@
       },
       "inputs": {
         "filename": "$(PB_SourcesDirectory)\\build.cmd",
-        "arguments": "-signing-validation -- /p:AzureAccessToken=$(PB_AzureAccessToken) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser) /p:OptionalToolSourcePassword=$(PB_OptionalToolSourcePassword) /p:OfficialBuildId=$(OfficialBuildId) /flp:v=detailed",
+        "arguments": "-signing-validation -- /p:AzureAccessToken=$(PB_AzureAccessToken) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser) /p:OptionalToolSourcePassword=$(PB_OptionalToolSourcePassword) /p:OfficialBuildId=$(OfficialBuildId) /flp:v=detailed /p:SignType=$(PB_SignType)",
         "workingFolder": "$(PB_SourcesDirectory)",
         "failOnStandardError": "false"
       }
diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index b97403e..07db339 100644
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -96,8 +96,7 @@
             "PB_AdditionalBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr",
             "PB_TargetArchitecture": "arm64",
             "PB_DistroRid": "win-arm64",
-            "PB_PortableBuild": "true",
-            "PB_SignType": "Real"
+            "PB_PortableBuild": "true"
           },
           "ReportingParameters": {
             "SubType": "PortableBuild",
@@ -113,8 +112,7 @@
             "PB_TargetArchitecture": "x64",
             "PB_PortableBuild": "true",
             "PB_PublishRidAgnosticPackages": "true",
-            "PB_BuildFullPlatformManifest": "true",
-            "PB_SignType": "Real"
+            "PB_BuildFullPlatformManifest": "true"
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",
diff --git a/src/installer/signing/signingvalidation.proj b/src/installer/signing/signingvalidation.proj
index 51b22b9..16cecb4 100644
--- a/src/installer/signing/signingvalidation.proj
+++ b/src/installer/signing/signingvalidation.proj
@@ -2,16 +2,16 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)..\dir.props" />
 
-  <Target Name="Build"
+  <Target Condition="'$(SignType)' == 'real'" Name="Build"
           DependsOnTargets="BuildPrerequisites;
                             Validate" />
 
-  <Target Name="BuildPrerequisites"
+  <Target Condition="'$(SignType)' == 'real'" Name="BuildPrerequisites"
           DependsOnTargets="CreateVersionInfoFile;
                             BuildCustomTasks;
                             RestoreOptionalToolingPackages" />
 
-  <Target Name="Validate">
+  <Target Condition="'$(SignType)' == 'real'" Name="Validate">
     <MSBuild Projects="$(MSBuildThisFileDirectory)\validation.targets" />
   </Target>
   <Import Project="$(MSBuildThisFileDirectory)..\dir.targets" />
-- 
2.7.4