Skip to content

Commit 11a4f4e

Browse files
committed
Revert "try prerelease label"
This reverts commit 32b5433.
1 parent 657d4f3 commit 11a4f4e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build-cli-native-archives.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_call:
55

66
env:
7-
GH_PR_NUMBER: ${{ github.event_name == 'pull_request' && github.event.number || '' }}
7+
VERSION_SUFFIX_OVERRIDE: ${{ github.event_name == 'pull_request' && format('/p:VersionSuffix=pr.{0}', github.event.number) || '' }}
88

99
jobs:
1010

@@ -39,6 +39,7 @@ jobs:
3939
/p:ContinuousIntegrationBuild=true
4040
/p:SkipManagedBuild=true
4141
/p:TargetRids=${{ matrix.targets.rids }}
42+
${{ env.VERSION_SUFFIX_OVERRIDE }}
4243
4344
- name: Build CLI packages (Unix)
4445
env:
@@ -54,6 +55,7 @@ jobs:
5455
/p:ContinuousIntegrationBuild=true
5556
/p:SkipManagedBuild=true
5657
/p:TargetRids=${{ matrix.targets.rids }}
58+
${{ env.VERSION_SUFFIX_OVERRIDE }}
5759
5860
- name: Upload logs
5961
if: always()

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
workflow_call
66

77
env:
8-
GH_PR_NUMBER: ${{ github.event_name == 'pull_request' && github.event.number || '' }}
8+
VERSION_SUFFIX_OVERRIDE: ${{ github.event_name == 'pull_request' && format('/p:VersionSuffix=pr.{0}', github.event.number) || '' }}
99

1010
jobs:
1111
# Duplicated jobs so their dependencies are not blocked on both the
@@ -66,7 +66,7 @@ jobs:
6666
- name: Build with packages
6767
env:
6868
CI: false
69-
run: ./build.sh -restore -build -ci -pack -bl -p:InstallBrowsersForPlaywright=false -p:SkipTestProjects=true
69+
run: ./build.sh -restore -build -ci -pack -bl -p:InstallBrowsersForPlaywright=false -p:SkipTestProjects=true ${{ env.VERSION_SUFFIX_OVERRIDE }}
7070

7171
- name: Upload built NuGets
7272
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1

eng/Versions.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<MinorVersion>5</MinorVersion>
66
<PatchVersion>0</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
8-
<PreReleaseVersionLabel Condition="'$(GITHUB_ACTIONS)' == 'true' and '$(GH_PR_NUMBER)' != ''">pr.$(GH_PR_NUMBER)</PreReleaseVersionLabel>
9-
<PreReleaseVersionLabel Condition="'$(PreReleaseVersionLabel)' == ''">preview.1</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
109
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
1110
<AllTargetFrameworks>$(DefaultTargetFramework);net9.0</AllTargetFrameworks>
1211
<!-- dotnet versions for running tests -->

0 commit comments

Comments
 (0)