diff --git a/Directory.Build.props b/Directory.Build.props
index bb661ee10c..a6a94fd4c4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,3 +1,7 @@
 <Project>
   <Import Project="version.xml" />
+
+  <PropertyGroup>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
 </Project>