From abb7213665a40d264e4b5b2201f3d1c54079ac61 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Tue, 3 Jul 2018 16:39:31 -0700
Subject: [PATCH] Allows include build number for packages blocked from going
 stable

For any packages that we doin't want to ship and marked as
BlockStable we should always force include the label and
build number in the package name.
---
 dir.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dir.targets b/dir.targets
index 2bf1e4371d35..5bc52a85093a 100644
--- a/dir.targets
+++ b/dir.targets
@@ -93,6 +93,15 @@
     </BinPlaceConfiguration>
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(BlockStable)' == 'true'">
+    <!--
+      If BlockStable is set to true then always include the label and build number in the package version.
+      This needs to be set before we import packaging.targets which comes in the Build.Common.targets.
+    -->
+    <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
+    <IncludeBuildNumberInPackageVersion>true</IncludeBuildNumberInPackageVersion>
+  </PropertyGroup>
+
   <Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" />
 
   <!-- permit a wrapping build system to contribute targets to this build -->