Skip to content

Commit 6f470af

Browse files
committed
fixup! Fix load order of ProjectStaging and restrict package version validation to only official builds
1 parent 25ef112 commit 6f470af

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: eng/MSBuild/ProjectStaging.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
In 8.0, we shipped Microsoft.AspNetCore.Testing package as stable even when it was in the dev stage, so we
1515
keep it as stable for compatiblity.
1616
-->
17-
<DotNetFinalVersionKind Condition=" '$(configureDotNetFinalVersionKind)' == 'true' And '$(DotNetFinalVersionKind)' == '' And '$(_IsStable)' == 'true' ">release</DotNetFinalVersionKind>
17+
<DotNetFinalVersionKind Condition=" '$(StabilizePackageVersion)' == 'true' And '$(DotNetFinalVersionKind)' == '' And '$(_IsStable)' == 'true' ">release</DotNetFinalVersionKind>
1818

1919
<!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
2020
<NoWarn Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
2121
<!--
2222
Makes it such that the package version won't be stabilized even when the rest of the repo is going stable.
2323
https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
2424
-->
25-
<SuppressFinalPackageVersion />
2625
<SuppressFinalPackageVersion Condition=" '$(_IsStable)' != 'true' ">true</SuppressFinalPackageVersion>
2726
</PropertyGroup>
2827
</Project>

Diff for: eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<ApiCompatBaselineVersion>9.3.0</ApiCompatBaselineVersion>
1010
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1111
<!--
12-
When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
12+
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1313
-->
14-
<DotNetFinalVersionKind />
14+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1515
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
1616
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
1717
</PropertyGroup>

0 commit comments

Comments
 (0)