Fix typo.

pull/70/head
Laurents Meyer 5 years ago
parent c661926684
commit ad650100a6

@ -14,7 +14,7 @@
<!--
The following properties will automatically be set by CI builds when appropriate:
ContinuesIntegrationTimestamp
ContinuousIntegrationTimestamp
BuildSha
-->
</PropertyGroup>
@ -30,7 +30,7 @@
<PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true'">
<VersionSuffix>$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</VersionSuffix>
<VersionSuffix Condition="'$(ContinuesIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuesIntegrationTimestamp)</VersionSuffix>
<VersionSuffix Condition="'$(ContinuousIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuousIntegrationTimestamp)</VersionSuffix>
<VersionSuffix Condition="'$(BuildSha)' != ''">$(VersionSuffix)+sha.$(BuildSha)</VersionSuffix>
</PropertyGroup>

@ -129,14 +129,14 @@ jobs:
$officialBuild = '$(Build.SourceBranch)' -match '^refs/tags/[0-9]+\.[0-9]+\.[0-9]+'
$wipBuild = '$(Build.SourceBranch)' -match '^refs/heads/.*-wip$'
$ciBuildOnly = $wipBuild -or ('$(Build.SourceBranch)' -match '^refs/heads/(?:master|.*-maint)$')
$continuesIntegrationTimestamp = Get-Date -Format yyyyMMddHHmmss
$continuousIntegrationTimestamp = Get-Date -Format yyyyMMddHHmmss
$buildSha = '$(Build.SourceVersion)'.SubString(0, 7);
$pack = '$(buildAndTestSucceeded)' -eq "true" -and ($officialBuild -or $ciBuildOnly) -or $wipBuild
echo "officialBuild: $officialBuild"
echo "wipBuild: $wipBuild"
echo "ciBuildOnly: $ciBuildOnly"
echo "continuesIntegrationTimestamp: $continuesIntegrationTimestamp"
echo "continuousIntegrationTimestamp: $continuousIntegrationTimestamp"
echo "buildSha: $buildSha"
echo "pack: $pack"
@ -146,7 +146,7 @@ jobs:
if ($ciBuildOnly)
{
$arguments += "-p:ContinuesIntegrationTimestamp=$continuesIntegrationTimestamp"
$arguments += "-p:ContinuousIntegrationTimestamp=$continuousIntegrationTimestamp"
$arguments += "-p:BuildSha=$buildSha"
}

Loading…
Cancel
Save