Skip to content

Sign fix #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codito merged 3 commits into from
Dec 10, 2016
Merged

Sign fix #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e3e382
Include microbuild.core as a dependency for signing.
Dec 10, 2016
c2b6dd1
Make delay sign conditional for CI builds.
Dec 10, 2016
6dd8c38
Merge branch 'master' into sign-fix
codito Dec 10, 2016
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
7 changes: 4 additions & 3 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Param(
[System.Boolean] $Localized = $false,

[Parameter(Mandatory=$false)]
[Alias("real")]
[System.Boolean] $RealBuild = $false
[Alias("ci")]
[Switch] $CIBuild = $false
)

$ErrorActionPreference = "Stop"
Expand Down Expand Up @@ -68,6 +68,7 @@ $TPB_Configuration = $Configuration
$TPB_TargetRuntime = $TargetRuntime
$TPB_Version = $Version
$TPB_VersionSuffix = $VersionSuffix
$TPB_CIBuild = $CIBuild

# Capture error state in any step globally to modify return code
$Script:ScriptFailed = $false
Expand Down Expand Up @@ -149,7 +150,7 @@ function Invoke-Build

Write-Log ".. .. Build: Source: $TPB_Solution"
Write-Verbose "$dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version"
& $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version
& $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild
Write-Log ".. .. Build: Complete."

if ($lastExitCode -ne 0) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/TestPlatform.Settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<PublicSign>true</PublicSign>
<!--<DelaySign>true</DelaySign>-->
<PublicSign Condition="'$(CIBuild)' == '' or '$(CIBuild)' == 'false'">true</PublicSign>
<DelaySign Condition="'$(CIBuild)' == 'true'">true</DelaySign>
<!--<GenerateDocumentationFile>true</GenerateDocumentationFile>-->
<AssemblyOriginatorKeyFile>$(TestPlatformRoot)scripts/key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down