Skip to content

Commit 80ed1bd

Browse files
[release/6.0] Don't special case "Experimental" projects (#60643)
* Don't special case "Experimental" projects We only have one experimental project, System.Runtime.Experimental and we want it to behave like any other package. * Make coreclr packages use `IsShipping` Co-authored-by: Eric StJohn <[email protected]>
1 parent 263945a commit 80ed1bd

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

Directory.Build.props

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,11 @@
256256
<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
257257
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
258258
<IsPrerelease>true</IsPrerelease>
259-
<IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
260259
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
261-
<!-- Experimental packages should not be stable -->
262-
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
263-
<IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
260+
<!-- Private packages should not be stable -->
261+
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
264262
<!-- We don't want Private packages to be shipped to NuGet.org -->
265-
<IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
263+
<IsShippingPackage Condition="$(IsPrivateAssembly)">false</IsShippingPackage>
266264
<PlaceholderFile>$(RepositoryEngineeringDir)_._</PlaceholderFile>
267265
</PropertyGroup>
268266

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
<!-- coreclr doesn't currently use the index so don't force it to be in sync -->
1818
<SkipIndexCheck>true</SkipIndexCheck>
19-
20-
<!-- Central place to set the versions of all nuget packages produced in the repo -->
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>
2419
</PropertyGroup>
2520

2621
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<Project>
22
<Import Project="..\Directory.Build.targets" />
3+
4+
<PropertyGroup>
5+
<!-- Central place to set the versions of all nuget packages produced in the repo -->
6+
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
7+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == '' and '$(PreReleaseVersionLabel)' != 'servicing'">$(PackageVersion)</StableVersion>
8+
<StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
9+
</PropertyGroup>
10+
311
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
412

513
<!--

src/coreclr/.nuget/ILCompiler.Reflection.ReadyToRun.Experimental/ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33

44
<PropertyGroup>
5+
<IsShipping>false</IsShipping>
56
<PackageDescription>This package provides a low-level ReadyToRun file format decoder. This package is experimental.</PackageDescription>
67
</PropertyGroup>
78

src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.pkgproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project DefaultTargets="Build">
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33
<PropertyGroup>
4+
<IsShipping>false</IsShipping>
45
<CreatePackedPackage>false</CreatePackedPackage>
56
<PackageDescription>Private transport package for .NET Core cross OS diagnostic tooling.</PackageDescription>
67
</PropertyGroup>

0 commit comments

Comments
 (0)