diff --git a/GitVersion.yml b/GitVersion.yml index 0680eb422..d672456c7 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,10 +2,17 @@ assembly-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment branches: master: + regex: master tag: alpha prevent-increment-of-merged-branch-version: true dev: + regex: dev(elop)?(ment)?$ tag: unstable + pull-request: + regex: (pull|pull\-requests|pr)[/-] + mode: ContinuousDelivery + tag: pr + prevent-increment-of-merged-branch-version: false next-version: 2.4 ignore: sha: [] diff --git a/build.ps1 b/build.ps1 index 9e0151af1..d4a086033 100644 --- a/build.ps1 +++ b/build.ps1 @@ -87,18 +87,18 @@ function Set-DevEnvironment { } $output = cmd /c "`"$devEnv`" & set" - + foreach ($line in $output) { if ($line -match "(?.*?)=(?.*)") { $key = $matches["key"] $value = $matches["value"] - + Write-Verbose("$key=$value") Set-Item "ENV:\$key" -Value "$value" -Force } } - + if (Get-Command $msbuild -ErrorAction SilentlyContinue) { Write-Host "Added $msbuild to path" @@ -128,7 +128,7 @@ if ($Platform -eq "AnyCPU") { Push-Location $root -& msbuild PortabilityTools.sln "/t:restore;build;pack" /p:Configuration=$Configuration /p:Platform="$PlatformToUse" /nologo /m /v:m /nr:false "/bl:$binFolder\msbuild.binlog" +& msbuild PortabilityTools.sln "/t:restore;build;pack" /p:Configuration=$Configuration /p:Platform="$PlatformToUse" /nologo /m:1 /v:m /nr:false "/bl:$binFolder\msbuild.binlog" Pop-Location