Merge pull request #146 from heaths/cloudbuildvars

Also set GitBuildVersionSimple cloud variable

Author: AArnott

doc/cloudbuild.md

@@ -59,6 +59,7 @@ range.
 | --- | --- | --- |
 | GitAssemblyInformationalVersion | AssemblyInformationalVersion | 1.3.1+g15e1898f47
 | GitBuildVersion | BuildVersion | 1.3.1.57621
+| GitBuildVersionSimple | BuildVersionSimple | 1.3.1
 
 This means you can use these variables in subsequent steps in your cloud build
 such as publishing artifacts, so that your richer version information can be

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -513,14 +513,24 @@ public async Task CloudBuildVariables_SetInCI(IReadOnlyDictionary<string, string
 
             var buildResult = await this.BuildAsync();
             AssertStandardProperties(versionOptions, buildResult);
+
+            // Assert GitBuildVersion was set
             string conditionallyExpectedMessage = UnitTestCloudBuildPrefix + expectedMessage
                 .Replace("{NAME}", "GitBuildVersion")
                 .Replace("{VALUE}", buildResult.BuildVersion);
             Assert.Contains(alwaysExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
             Assert.Contains(conditionallyExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
 
+            // Assert GitBuildVersionSimple was set
+            conditionallyExpectedMessage = UnitTestCloudBuildPrefix + expectedMessage
+                .Replace("{NAME}", "GitBuildVersionSimple")
+                .Replace("{VALUE}", buildResult.BuildVersionSimple);
+            Assert.Contains(alwaysExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
+            Assert.Contains(conditionallyExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
+
             // Assert that project properties are also set.
             Assert.Equal(buildResult.BuildVersion, buildResult.GitBuildVersion);
+            Assert.Equal(buildResult.BuildVersionSimple, buildResult.GitBuildVersionSimple);
             Assert.Equal(buildResult.AssemblyInformationalVersion, buildResult.GitAssemblyInformationalVersion);
 
             // Assert that env variables were also set in context of the build.
@@ -530,12 +540,22 @@ public async Task CloudBuildVariables_SetInCI(IReadOnlyDictionary<string, string
             this.WriteVersionFile(versionOptions);
             buildResult = await this.BuildAsync();
             AssertStandardProperties(versionOptions, buildResult);
+
+            // Assert GitBuildVersion was not set
             conditionallyExpectedMessage = UnitTestCloudBuildPrefix + expectedMessage
                 .Replace("{NAME}", "GitBuildVersion")
                 .Replace("{VALUE}", buildResult.BuildVersion);
             Assert.Contains(alwaysExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
             Assert.DoesNotContain(conditionallyExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
             Assert.NotEqual(buildResult.BuildVersion, buildResult.BuildResult.ProjectStateAfterBuild.GetPropertyValue("GitBuildVersion"));
+
+            // Assert GitBuildVersionSimple was not set
+            conditionallyExpectedMessage = UnitTestCloudBuildPrefix + expectedMessage
+                .Replace("{NAME}", "GitBuildVersionSimple")
+                .Replace("{VALUE}", buildResult.BuildVersionSimple);
+            Assert.Contains(alwaysExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
+            Assert.DoesNotContain(conditionallyExpectedMessage, buildResult.LoggedEvents.Select(e => e.Message.TrimEnd()));
+            Assert.NotEqual(buildResult.BuildVersionSimple, buildResult.BuildResult.ProjectStateAfterBuild.GetPropertyValue("GitBuildVersionSimple"));
         }
     }
 
@@ -1104,6 +1124,7 @@ internal BuildResults(BuildResult buildResult, IReadOnlyList<BuildEventArgs> log
         public string RootNamespace => this.BuildResult.ProjectStateAfterBuild.GetPropertyValue("RootNamespace");
 
         public string GitBuildVersion => this.BuildResult.ProjectStateAfterBuild.GetPropertyValue("GitBuildVersion");
+        public string GitBuildVersionSimple => this.BuildResult.ProjectStateAfterBuild.GetPropertyValue("GitBuildVersionSimple");
         public string GitAssemblyInformationalVersion => this.BuildResult.ProjectStateAfterBuild.GetPropertyValue("GitAssemblyInformationalVersion");
 
         public override string ToString()

src/NerdBank.GitVersioning/VersionOracle.cs

@@ -246,6 +246,7 @@ public IDictionary<string, string> CloudBuildVersionVars
                 {
                     { "GitAssemblyInformationalVersion", this.AssemblyInformationalVersion },
                     { "GitBuildVersion", this.Version.ToString() },
+                    { "GitBuildVersionSimple", this.SimpleVersion.ToString() },
                 };
             }
         }