Skip to content

Commit 3eb0102

Browse files
committed
Stabilize package Versions for 5.0.0
- remove `$(DisableServicingFeatures)` property; `$(IsServicingBuild)` works now
1 parent 5b6362f commit 3eb0102

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

eng/Versions.props

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,15 @@
1212
<!--
1313
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1414
-->
15-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
15+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1616
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1717
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
1818
<PreReleaseBrandingLabel>RTM $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
1919
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
2020
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2121
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
22-
<!--
23-
Until package baselines are updated (see dotnet/aspnetcore#12702), ignore them and PatchConfig.props. This also
24-
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
25-
-->
26-
<DisableServicingFeatures Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
2722
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
28-
<IsServicingBuild Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
23+
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
2924
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
3025
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
3126
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>

0 commit comments

Comments
 (0)