Fix build in release/2.0.0 (#3245)

dotnet · Sep 28, 2017 · 9ea59b6 · 9ea59b6
1 parent bb6dac8
commit 9ea59b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/buildpipeline/Core-Setup-Windows-Arm-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json
@@ -68,7 +68,7 @@
         "definitionType": "task"
       },
       "inputs": {
-        "signType": "$(PB_SignType)",
+        "signType": "real",
         "zipSources": "false",
         "version": "",
         "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -448,7 +448,8 @@
       "value": "HEAD"
     },
     "PB_SignType": {
-      "value": "real"
+      "value": "real",
+      "allowOverride": true
     },
     "PB_CommonMSBuildArgs": {
       "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)"

diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json
@@ -68,7 +68,7 @@
         "definitionType": "task"
       },
       "inputs": {
-        "signType": "$(PB_SignType)",
+        "signType": "real",
         "zipSources": "false",
         "version": "",
         "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -646,7 +646,8 @@
       "value": "HEAD"
     },
     "PB_SignType": {
-      "value": "real"
+      "value": "real",
+      "allowOverride": true
     },
     "PB_CommonMSBuildArgs": {
       "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)"

diff --git a/sign.proj b/sign.proj
@@ -22,7 +22,7 @@
     <Error Condition="!Exists('$(OutDir)')" Text="'OutDir' folder '$(OutDir)' does not exist."/>
   </Target>
 
-  <Target Name="SignBinaries" DependsOnTargets="GetSignBinaryFiles">
+  <Target Name="SignBinaries" Condition="'$(SignType)' == 'real'" DependsOnTargets="GetSignBinaryFiles">
     <CallTarget Targets="SignFiles" />
   </Target>
 
@@ -53,7 +53,7 @@
     <Error Condition="'@(FilesToSign)' == ''" Text="There are no files to sign. FilesToSign group is empty."/>
   </Target>
 
-  <Target Name="SignMsiAndCab" DependsOnTargets="GetSignMsiAndCabFiles">
+  <Target Name="SignMsiAndCab" Condition="'$(SignType)' == 'real'" DependsOnTargets="GetSignMsiAndCabFiles">
     <CallTarget Targets="SignFiles" />
   </Target>
 
@@ -69,7 +69,7 @@
     <Error Condition="'@(FilesToSign)' == ''" Text="There are no files to sign. FilesToSign group is empty."/>
   </Target>
 
-  <Target Name="SignEngine" DependsOnTargets="GetSignEngineFiles">
+  <Target Name="SignEngine" Condition="'$(SignType)' == 'real'" DependsOnTargets="GetSignEngineFiles">
     <CallTarget Targets="SignFiles" />
   </Target>
 
@@ -82,7 +82,7 @@
     <Error Condition="'@(FilesToSign)' == ''" Text="There are no files to sign. FilesToSign group is empty."/>
   </Target>
 
-  <Target Name="SignBundle" DependsOnTargets="GetSignBundleFiles">
+  <Target Name="SignBundle" Condition="'$(SignType)' == 'real'" DependsOnTargets="GetSignBundleFiles">
     <CallTarget Targets="SignFiles" />
   </Target>