Skip to content

Commit 93bc3d4

Browse files
authored
Check DotNetFinalVersionKind when setting WorkloadVersionSuffix (#91791)
1 parent bfdfb82 commit 93bc3d4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
1212
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
14-
<WorkloadVersionSuffix Condition="'$(PreReleaseVersionLabel)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
14+
<!-- Enable to remove prerelease label. -->
15+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
16+
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
17+
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
1518
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
1619
<!-- set to false for release branches -->
1720
<WorkloadsTestPreviousVersions Condition="'$(WorkloadsTestPreviousVersions)' == ''">false</WorkloadsTestPreviousVersions>
1821
<!-- Set assembly version to align with major and minor version,
1922
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
2023
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
21-
<!-- Enable to remove prerelease label. -->
22-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
23-
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2424
<!-- Opt-in/out repo features -->
2525
<UsingToolMicrosoftNetILLinkTasks Condition="'$(UsingToolMicrosoftNetILLinkTasks)' == ''">true</UsingToolMicrosoftNetILLinkTasks>
2626
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>

0 commit comments

Comments
 (0)