Skip to content

Commit 4c87d15

Browse files
authored
feat: Update prerelease labels (#1064)
Use the prerelease label to identify the package version. Issue: 201475
1 parent f210331 commit 4c87d15

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

.github/workflows/Build.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,21 @@ jobs:
5959
'master' {
6060
$IsPrerelease = $true
6161
$IsMaster = $true
62-
6362
$SHOULD_DEPLOY = 'true'
6463
}
6564
6665
'beta' {
6766
$IsPrerelease = $true
68-
6967
$SHOULD_DEPLOY = 'true'
7068
}
7169
7270
'release-*' {
7371
$IsPrerelease = $false
74-
7572
$SHOULD_DEPLOY = 'true'
7673
}
7774
7875
default {
7976
$IsPrerelease = $false
80-
8177
$SHOULD_DEPLOY = 'false'
8278
}
8379
}
@@ -93,7 +89,7 @@ jobs:
9389
$NUGET_PACKAGE_VERSION = $GetFileVersionOutput
9490
9591
if ($IsPrerelease -eq $true) {
96-
$VersionTag = @("trunk", "stable")[$IsMaster]
92+
$VersionTag = @("beta", "preview")[$IsMaster]
9793
$Timestamp = (Get-Date -AsUTC).ToString("yyyyMMddHHmmss")
9894
$NUGET_PACKAGE_VERSION = $NUGET_PACKAGE_VERSION + "-" + $VersionTag + "." + $Timestamp
9995
}

dotnet/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<AssemblyVersion>11.0.0.0</AssemblyVersion>
44
<MajorFileVersion>1</MajorFileVersion>
5-
<MajorFileVersion Condition="$(GIT_REF.EndsWith('beta'))">$([MSBuild]::Add($(MajorFileVersion), 100))</MajorFileVersion>
65
<MinorFileVersion>31</MinorFileVersion>
76
<PatchFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</PatchFileVersion>
87
<PatchFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</PatchFileVersion>

0 commit comments

Comments
 (0)