Skip to content

Commit a23a20b

Browse files
authored
fix stable package proj versioning support (#58474)
1 parent db3f308 commit a23a20b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/coreclr/.nuget/Directory.Build.props

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@
1818
<SkipIndexCheck>true</SkipIndexCheck>
1919

2020
<!-- Central place to set the versions of all nuget packages produced in the repo -->
21-
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
22-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
21+
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
22+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == '' and '$(PreReleaseVersionLabel)' != 'servicing'">$(PackageVersion)</StableVersion>
23+
<StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Experimental')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
27+
<IsShipping>false</IsShipping>
2328
</PropertyGroup>
2429

2530
<ItemGroup>

src/mono/nuget/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<SkipIndexCheck>true</SkipIndexCheck>
1515

1616
<!-- Central place to set the versions of all nuget packages produced in the repo -->
17-
<PackageVersion Condition="'$(ProductVersion)' == ''">6.0.0</PackageVersion>
17+
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
1818
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
19+
<StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

0 commit comments

Comments
 (0)