Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Update experimental IsShipping and block stable properties #41513

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Update experimental IsShipping and block stable properties #41513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,11 @@
</PropertyGroup>

<PropertyGroup>
<!-- When IsShipping property is set, other IsShipping* properties take its value if they are not set.
This is why IsShippingPackage is only set for Private packages, as Experimental are covered with IsShipping -->
<IsShipping Condition="$(MSBuildProjectName.Contains('Experimental'))">false</IsShipping>
<!-- Experimental packages should not be stable -->
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Experimental'))">true</SuppressFinalPackageVersion>
<IsShippingAssembly Condition="$(MSBuildProjectName.Contains('Experimental'))">false</IsShippingAssembly>

<!-- We don't want Private packages to be shipped to NuGet.org -->
<IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions pkg/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
</ItemGroup>

<PropertyGroup>
<!-- BlockStable on private packages by default -->
<BlockStable Condition="'$(BlockStable)' == '' and $(MSBuildProjectName.Contains('Private'))">true</BlockStable>
<!-- SuppressFinalPackageVersion on private packages by default -->
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Private'))">true</SuppressFinalPackageVersion>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions pkg/baseline/baseline.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Below targets should moved to packaging.targets in BuildTools but keeping in corefx for convenience right now
-->

<Target Name="BlockStable" Condition="'$(BlockStable)' == 'true'" AfterTargets="CalculatePackageVersion">
<Target Name="BlockStable" Condition="'$(SuppressFinalPackageVersion)' == 'true'" AfterTargets="CalculatePackageVersion">
<!-- DO NOT ship this packages as stable -->
<Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
</Target>
Expand All @@ -20,7 +20,7 @@
<Target Name="GetPackageIdentityIfStable"
Returns="@(_StablePackageIdentity)">

<ItemGroup Condition="'$(BlockStable)' != 'true'">
<ItemGroup Condition="'$(SuppressFinalPackageVersion)' != 'true'">
<_StablePackageIdentity Include="$(Id)">
<Version>$(PackageVersion)</Version>
</_StablePackageIdentity>
Expand Down
3 changes: 2 additions & 1 deletion src/System.Numerics.Tensors/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AssemblyVersion>0.2.0.0</AssemblyVersion>
<StrongNameKeyId>Open</StrongNameKeyId>
<!-- This is a preview package. Do not mark as stable. -->
<BlockStable>true</BlockStable>
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
<IsShippingAssembly>false</IsShippingAssembly>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion src/System.Numerics.Tensors/pkg/System.Numerics.Tensors.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
<MinClientVersion>2.8.6</MinClientVersion>
<IsShipping>false</IsShipping>
</PropertyGroup>
<ItemGroup>
<!-- We don't include the reference project for two reasons:
Expand Down
2 changes: 0 additions & 2 deletions src/System.Runtime.Intrinsics.Experimental/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<!-- DO NOT ship this as stable. It contains preview-only APIs that will be stable in a future version. -->
<BlockStable>true</BlockStable>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>
</Project>
2 changes: 0 additions & 2 deletions src/System.Utf8String.Experimental/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<!-- System.Memory uses the Open key, so we will also. -->
<StrongNameKeyId>Open</StrongNameKeyId>
<!-- This is a preview package. Do not ship as stable. -->
<BlockStable>true</BlockStable>
</PropertyGroup>
</Project>