Skip to content

Commit 4e61baa

Browse files
[release/9.0] Branding for GA (#107879)
* Branding PreReleaseVersionLabel and PreReleaseVersionIteration * Set PRERELEASE 0 in configureplatform.cmake * Add check to properly handle release/rtm naming for workloads Ported from a419d35 --------- Co-authored-by: Eric StJohn <[email protected]>
1 parent b310f25 commit 4e61baa

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

eng/Versions.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
<PackageVersionNet8>8.0.10</PackageVersionNet8>
1111
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1212
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25))</PackageVersionNet6>
13-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
14-
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
13+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
14+
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
18-
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
18+
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == ''">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
19+
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
1920
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
2021
<!-- Set assembly version to align with major and minor version,
2122
as for the patches and revisions should be manually updated per assembly if it is serviced. -->

eng/native/configureplatform.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
22

33
# If set, indicates that this is not an officially supported release.
44
# Release branches should set this to false.
5-
set(PRERELEASE 1)
5+
set(PRERELEASE 0)
66

77
#----------------------------------------
88
# Detect and set platform variable names

0 commit comments

Comments
 (0)