DataProtection 271 B

123456789101112131415161718
  1. commit 3d30ea824908f3e110ff4ebcb2110a84c6823530
  2. Author: Pranav K <[email protected]>
  3. Date: Wed Feb 21 18:26:52 2018 -0800
  4. Use FeatureBranchVersionSuffix when generating VersionSuffix
  5. diff --git a/version.props b/version.props
  6. index 6025bea0867..f9146b21259 100644
  7. --- a/version.props
  8. +++ b/version.props
  9. @@ -6,6 +6,7 @@
  10. <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
  11. <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
  12. <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
  13. + <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
  14. <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
  15. </PropertyGroup>
  16. </Project>