Skip to content

Commit 27e743a

Browse files
authored
Try PR number again (#28)
1 parent c3d8a70 commit 27e743a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

azure-pipelines.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ variables:
88
CONFIGURATION: 'Release'
99
BUILD_PRERELEASE: true
1010
DOTNET_CORE_VERSION: 8.x
11+
PR_NUMBER: $[coalesce(variables['System.PullRequest.PullRequestNumber'], '0')]
1112

1213
jobs:
1314
- job: pack
@@ -26,7 +27,7 @@ jobs:
2627
dotnet tool restore
2728
displayName: Restore .NET tools
2829
- pwsh: |
29-
dotnet cake --target=Pack --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
30+
dotnet cake --target=Pack --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$(PR_NUMBER)"
3031
displayName: Pack
3132
- task: PublishBuildArtifacts@1
3233
displayName: Publish NuGet packages
@@ -50,7 +51,7 @@ jobs:
5051
dotnet tool restore
5152
displayName: Restore .NET tools
5253
- pwsh: |
53-
dotnet cake --target=Build --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
54+
dotnet cake --target=Build --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$(PR_NUMBER)"
5455
displayName: Build
5556
5657
- job: test
@@ -69,7 +70,7 @@ jobs:
6970
dotnet tool restore
7071
displayName: Restore .NET tools
7172
- pwsh: |
72-
dotnet cake --target=Test --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
73+
dotnet cake --target=Test --configuration="$(CONFIGURATION)" --packageVersion="$(PACKAGE_VERSION)" --prerelease="$(BUILD_PRERELEASE)" --pullrequest="$(PR_NUMBER)"
7374
displayName: Run tests
7475
- task: PublishBuildArtifacts@1
7576
displayName: Publish artifacts

build.cake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var target = Argument("target", "Default");
22
var configuration = Argument("configuration", "Release");
3-
var pullrequest = Argument("pullrequest", "");
4-
var prerelease = Argument("prerelease", true) || !string.IsNullOrEmpty(pullrequest);
3+
var pullrequest = Argument("pullrequest", 0);
4+
var prerelease = Argument("prerelease", true) || pullrequest > 0;
55

66
// a bit of logic to create the version number:
77
// - input = 1.2.3.4
@@ -13,7 +13,7 @@ var assemblyVersion = $"{version.Major}.0.0.0";
1313
var fileVersion = $"{version.Major}.{version.Minor}.{version.Build}.0";
1414
var infoVersion = $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
1515
var packageVersion = $"{version.Major}.{version.Minor}.{version.Build}";
16-
var previewlabel = string.IsNullOrEmpty(pullrequest) ? "preview" : $"pr.{pullrequest}";
16+
var previewlabel = pullrequest > 0 ? $"pr.{pullrequest}" : "preview";
1717
var previewVersion = $"{packageVersion}-{previewlabel}.{previewNumber}";
1818
var finalBuildNumber = prerelease ? previewVersion : packageVersion;
1919

0 commit comments

Comments
 (0)