Fixed handling of release builds to drop the CI naming

Author: smaillet

BuildVersion.xml

@@ -5,6 +5,4 @@ This file is updated on a public release to set the next build that pre-releases
     BuildMajor = "2"
     BuildMinor = "0"
     BuildPatch = "0"
-    PreReleaseName = "beta"
-    PreReleaseNumber = "2"
 />

Directory.Build.props

@@ -63,7 +63,7 @@
         -->
         <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsPullRequestBuild)'=='true'">PRQ</CiBuildName>
         <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsAutomatedBuild)'=='true'">BLD</CiBuildName>
-        <CiBuildName Condition="'$(CiBuildName)'==''">ZZZ</CiBuildName>
+        <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsReleaseBuild)'!='true'">ZZZ</CiBuildName>
     </PropertyGroup>
     <Choose>
         <!-- TODO: Split this out so analyzers and common settings are in a common package for easier sharing amongst repositories and projects -->

src/CSemVer.Build.Tasks/CreateVersionInfo.cs

@@ -51,12 +51,15 @@ public class CreateVersionInfo
         public override bool Execute( )
         {
             PrereleaseVersion preReleaseVersion = null;
-            preReleaseVersion = new PrereleaseVersion( PreReleaseName
-                                                     , string.IsNullOrWhiteSpace(PreReleaseNumber) ? 0 : Convert.ToInt32( PreReleaseNumber )
-                                                     , string.IsNullOrWhiteSpace(PreReleaseFix) ? 0 : Convert.ToInt32( PreReleaseFix )
-                                                     , CiBuildName
-                                                     , CiBuildIndex
-                                                     );
+            if( !string.IsNullOrWhiteSpace( CiBuildName ) )
+            {
+                preReleaseVersion = new PrereleaseVersion( PreReleaseName
+                                                         , string.IsNullOrWhiteSpace( PreReleaseNumber ) ? 0 : Convert.ToInt32( PreReleaseNumber )
+                                                         , string.IsNullOrWhiteSpace( PreReleaseFix ) ? 0 : Convert.ToInt32( PreReleaseFix )
+                                                         , CiBuildName
+                                                         , CiBuildIndex
+                                                         );
+            }
 
             var fullVersion = new CSemVer( Convert.ToInt32( BuildMajor )
                                          , Convert.ToInt32( BuildMinor )

src/CSemVer.Build.Tasks/build/CSemVer.Build.Tasks.props

@@ -13,7 +13,7 @@
         -->
         <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsPullRequestBuild)'=='true'">PRQ</CiBuildName>
         <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsAutomatedBuild)'=='true'">BLD</CiBuildName>
-        <CiBuildName Condition="'$(CiBuildName)'==''">ZZZ</CiBuildName>
+        <CiBuildName Condition="'$(CiBuildName)'=='' AND '$(IsReleaseBuild)'!='true'">ZZZ</CiBuildName>
 
         <TaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netstandard1.6</TaskFolder>
         <TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net46</TaskFolder>