Skip to content

Commit 6a1207f

Browse files
committed
updating AppVeyor build
1 parent ae481e4 commit 6a1207f

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

appveyor.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
version: 2.0.{build}
2+
init:
3+
- ps: |
4+
if ($env:FUNCTIONS_NIGHTLY -eq "1") {
5+
$version = Get-Date -Format "yyyyMMdd-HHmm"
6+
Update-AppveyorBuild -Version $version -Message "Functions Scheduled Build"
7+
}
28
pull_requests:
39
do_not_increment_build_number: true
410
branches:
@@ -15,8 +21,9 @@ install:
1521
1622
Install-Product node 8.4.0 x86
1723
build_script:
18-
- ps: >
19-
.\build.ps1 -buildNumber "$env:APPVEYOR_BUILD_NUMBER"
24+
- ps: |
25+
$hasTag = Test-Path env:APPVEYOR_REPO_TAG_NAME
26+
.\build.ps1 -buildNumber "$env:APPVEYOR_BUILD_NUMBER" -includeVersion (!$hasTag)
2027
after_build:
2128
- ps: >
2229
Get-ChildItem buildoutput\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName "Binaries" }

build.ps1

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
param (
22
[string]$buildNumber = "0",
33
[string]$extensionVersion = "2.0.$buildNumber",
4-
[string]$versionSuffix = "$buildNumber"
4+
[bool]$includeVersion = $true
55
)
66

77
$currentDir = Split-Path -Parent $MyInvocation.MyCommand.Path
@@ -157,9 +157,23 @@ function BuildPackages([string] $runtime, [bool] $isSelfContained) {
157157

158158
dotnet --version
159159
dotnet build .\WebJobs.Script.sln -v q /p:BuildNumber="$buildNumber"
160-
dotnet pack src\WebJobs.Script\WebJobs.Script.csproj -o ..\..\buildoutput --no-build --version-suffix $versionSuffix
161-
dotnet pack src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj -o ..\..\buildoutput --no-build --version-suffix $versionSuffix
162-
dotnet pack src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj -o ..\..\buildoutput --no-build --version-suffix $versionSuffix
160+
161+
$projects =
162+
"WebJobs.Script",
163+
"WebJobs.Script.WebHost",
164+
"WebJobs.Script.Grpc"
165+
166+
foreach ($project in $projects)
167+
{
168+
$cmd = "pack", "src\$project\$project.csproj", "-o", "..\..\buildoutput", "--no-build"
169+
170+
if ($includeVersion)
171+
{
172+
$cmd += "--version-suffix", "-$buildNumber"
173+
}
174+
175+
& dotnet $cmd
176+
}
163177

164178

165179
# build IL extensions

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<BuildNumber Condition=" '$(BuildNumber)' == '' ">1</BuildNumber>
55
<MajorMinorProductVersion>2.0</MajorMinorProductVersion>
6-
<Version>$(MajorMinorProductVersion).0-beta2-$(VersionSuffix)</Version>
6+
<Version>$(MajorMinorProductVersion).0-beta2$(VersionSuffix)</Version>
77
<AssemblyVersion>$(MajorMinorProductVersion).0.0</AssemblyVersion>
88
<FileVersion>$(MajorMinorProductVersion).$(BuildNumber).0</FileVersion>
99
<CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>

0 commit comments

Comments
 (0)