Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Fix build in release/2.0.0 #3245

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Fix build in release/2.0.0 #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions buildpipeline/Core-Setup-Windows-Arm-BT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)"
Expand Down
5 changes: 3 additions & 2 deletions buildpipeline/Core-Setup-Windows-BT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)"
Expand Down
8 changes: 4 additions & 4 deletions sign.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down