Skip to content

Commit 64aab55

Browse files
committed
CI Version property
1 parent fd38d02 commit 64aab55

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

MyGet.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function Test([string]$projectpath) {
1919
if($LASTEXITCODE -ne 0) { Die("$projectpath failed.") }
2020
}
2121

22-
.\build\build.ps1 -suffix "$env:PrereleaseTag" -config "$env:Configuration"
22+
.\build\build.ps1 -version "$env:PackageVersion" -config "$env:Configuration"
2323
if($LASTEXITCODE -ne 0) { Die("Build failed.") }
2424

2525
Test "Peachpie.ScriptTests"

build/Targets/Settings.props

+3-8
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
<PropertyGroup>
55

6-
<!-- common version -->
7-
<VersionPrefix Condition=" '$(VersionPrefix)'=='' ">0.9.9</VersionPrefix>
8-
<VersionSuffix Condition=" '$(VersionSuffix)'=='' and '$(IsDevBuild)'!='false' ">dev</VersionSuffix>
6+
<!-- version -->
7+
<Version Condition=" '$(Version)'=='' ">0.9.9-dev</Version>
8+
<PackageVersion>$(Version)</PackageVersion>
99

1010
<!-- metadata generation -->
1111
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
@@ -37,11 +37,6 @@
3737
<PackageOutputPath>$(MSBuildThisFileDirectory)../../.nugs</PackageOutputPath>
3838
<PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
3939
</PropertyGroup>
40-
41-
<PropertyGroup Condition=" '$(PackageVersion)'=='' ">
42-
<PackageVersion>$(VersionPrefix)</PackageVersion>
43-
<PackageVersion Condition=" '$(VersionSuffix)'!='' ">$(PackageVersion)-$(VersionSuffix)</PackageVersion>
44-
</PropertyGroup>
4540

4641
<!-- common targets -->
4742
<Import Project="CommonBuild.target" />

build/build.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Param(
2-
[string]$suffix = "dev",
2+
[string]$version = "0.9.9-dev",
33
[string]$config = "Debug"
44
)
55

6-
$props = "/p:VersionSuffix=$suffix,PackageVersionSuffix=$suffix,Configuration=$config"
6+
$props = "/p:Version=$version,Configuration=$config"
77

88
Write-Host -f Green "msbuild $props ..."
99

0 commit comments

Comments
 (0)