From 3c60bf0300771b3517fc318e4bdc403a04da7bee Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@gmail.com>
Date: Fri, 18 Jan 2019 21:00:22 -0800
Subject: [PATCH] Add tags automatically

---
 Directory.Build.targets | 11 +++++++++--
 version.props           |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 1612198d..67ebb311 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,2 +1,9 @@
-<!-- This file is intentionally empty -->
-<Project />
+<Project InitialTargets="UpdateCiSettings">
+  <Target Name="UpdateCiSettings" Condition="'$(CI)' == 'true'">
+    <Message Importance="High" Text="##vso[build.updatebuildnumber]$(PackageVersion)" />
+    <!-- These tags can be used in Azure release pipelines to filter actions based on the type of build. -->
+    <Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsStableBuild)' != 'true' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsStableBuild)' == 'true' " />
+    <Message Importance="high" Text="##vso[build.addbuildtag]code-signed" Condition=" '$(CodeSign)' == 'true' " />
+  </Target>
+</Project>
diff --git a/version.props b/version.props
index de3f2f4e..af27a158 100644
--- a/version.props
+++ b/version.props
@@ -2,11 +2,11 @@
   <PropertyGroup>
     <VersionPrefix>2.3.1</VersionPrefix>
     <VersionSuffix>build</VersionSuffix>
-    <IncludePreReleaseLabelInPackageVersion Condition="'$(IsFinalBuild)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
+    <IncludePreReleaseLabelInPackageVersion Condition="'$(IsStableBuild)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(BUILD_BUILDNUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
-    <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+    <FileVersion>$(VersionPrefix).$(BuildNumber.Replace('.',''))</FileVersion>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
     <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">$(APPVEYOR_REPO_COMMIT)</RepositoryCommit>
     <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">$(BUILD_SOURCEVERSION)</RepositoryCommit>