Skip to content

Commit f18ca7d

Browse files
[release/9.0-staging] Backport "Ship CoreCLR packages in servicing releases" (#113026)
1 parent 1ac12ea commit f18ca7d

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<SkipIndexCheck>true</SkipIndexCheck>
2020
</PropertyGroup>
2121

22-
<!-- CoreCLR nuget packages shouldn't be published during servicing. -->
23-
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
24-
<IsShipping>false</IsShipping>
25-
</PropertyGroup>
26-
2722
<ItemGroup>
2823
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
2924
</ItemGroup>

src/coreclr/.nuget/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<!-- Central place to set the versions of all nuget packages produced in the repo -->
66
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
7-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == '' and '$(PreReleaseVersionLabel)' != 'servicing'">$(PackageVersion)</StableVersion>
7+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
88
<StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
99
</PropertyGroup>
1010

0 commit comments

Comments
 (0)