Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767

external/corefx/pkg/baseline/baseline.props

@@ -1,14 +1,29 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.props" />
-  
+
   <PropertyGroup>
     <!-- Set PackageIndexFile to point to our local repo's index.  This tells the packaging targets
          which index should be used for updates -->
     <PackageIndexFile>$(MSBuildThisFileDirectory)..\Microsoft.Private.PackageBaseline\packageIndex.json</PackageIndexFile>
   </PropertyGroup>
 
+  <!--
+    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">
-    <!-- DO NOT ship this packages as stable in .NET Core 2.0. -->
+    <!-- DO NOT ship this packages as stable -->
     <Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
   </Target>
+
+  <!-- Get the package version if it isn't marked as block stable -->
+  <Target Name="GetPackageIdentityIfStable"
+          Returns="@(_StablePackageIdentity)">
+
+    <ItemGroup Condition="'$(BlockStable)' != 'true'">
+      <_StablePackageIdentity Include="$(Id)">
+        <Version>$(PackageVersion)</Version>
+      </_StablePackageIdentity>
+    </ItemGroup>
+  </Target>
 </Project>