Added additional variables for NuGet (see #201)

GitVersionCore/OutputVariables/VariableProvider.cs

@@ -27,6 +27,11 @@ public static class VariableProvider
         public const string AssemblyFileVersion = "AssemblyFileVersion";
         public const string OriginalRelease = "OriginalRelease";
 
+        // Synonyms
+        public const string NuGetVersionV2 = "NuGetVersionV2";
+        public const string NuGetVersionV3 = "NuGetVersionV3";
+        public const string NuGetVersion = "NuGetVersion";
+
         public static Dictionary<string, string> GetVariablesFor(
             SemanticVersion semanticVersion,
             AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
@@ -67,6 +72,10 @@ public static Dictionary<string, string> GetVariablesFor(
                     bmd.ReleaseDate.OriginalDate.UtcDateTime.ToString("u"))},
             };
 
+            variables[NuGetVersionV2] = variables[LegacySemVerPadded];
+            //variables[NuGetVersionV3] = variables[LegacySemVerPadded]; // TODO: when v3 is released, determine what to use
+            variables[NuGetVersion] = variables[NuGetVersionV2];
+
             return variables;
         }
     }

GitVersionCore/SemanticVersionPreReleaseTag.cs

@@ -6,8 +6,22 @@ namespace GitVersion
     public class SemanticVersionPreReleaseTag : 
         IFormattable, IComparable<SemanticVersionPreReleaseTag>, IEquatable<SemanticVersionPreReleaseTag>
     {
-        public string Name;
         public int? Number;
+        private string _name;
+
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                if (!string.IsNullOrWhiteSpace(value))
+                {
+                    value = value.ToLower();
+                }
+
+                _name = value;
+            }
+        }
 
         static LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
            new LambdaEqualityHelper<SemanticVersionPreReleaseTag>(x => x.Name, x => x.Number);

GitVersionTask/GetVersion.cs

@@ -74,6 +74,12 @@ public class GetVersion : Task
         [Output]
         public string OriginalRelease { get; set; }
 
+        [Output]
+        public string NuGetVersionV2 { get; set; }
+
+        [Output]
+        public string NuGetVersion { get; set; }
+
         TaskLogger logger;
 
         public GetVersion()

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt

@@ -44,6 +44,8 @@ static class GitVersionInformation
     public static string AssemblyVersion = "2.0.0.0";
     public static string AssemblyFileVersion = "2.3.4.0";
     public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
+    public static string NuGetVersionV2 = "2.3.4";
+    public static string NuGetVersion = "2.3.4";
 
 }
 

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt

@@ -44,6 +44,8 @@ static class GitVersionInformation
     public static string AssemblyVersion = "2.3.0.0";
     public static string AssemblyFileVersion = "2.3.4.0";
     public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
+    public static string NuGetVersionV2 = "2.3.4";
+    public static string NuGetVersion = "2.3.4";
 
 }
 

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt

@@ -44,6 +44,8 @@ static class GitVersionInformation
     public static string AssemblyVersion = "2.3.4.0";
     public static string AssemblyFileVersion = "2.3.4.0";
     public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
+    public static string NuGetVersionV2 = "2.3.4";
+    public static string NuGetVersion = "2.3.4";
 
 }
 

Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_None.approved.txt

@@ -44,6 +44,8 @@ static class GitVersionInformation
     public static string AssemblyVersion = "1.0.0.0";
     public static string AssemblyFileVersion = "2.3.4.0";
     public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
+    public static string NuGetVersionV2 = "2.3.4";
+    public static string NuGetVersion = "2.3.4";
 
 }
 

Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt

@@ -44,6 +44,8 @@ static class GitVersionInformation
     public static string AssemblyVersion = "1.2.3.0";
     public static string AssemblyFileVersion = "1.2.3.0";
     public static string OriginalRelease = "originalCommitSha.2014-03-01 00:00:01Z";
+    public static string NuGetVersionV2 = "1.2.3-unstable0004";
+    public static string NuGetVersion = "1.2.3-unstable0004";
 
 }
 

Tests/JsonVersionBuilderTests.Json.approved.txt

@@ -19,5 +19,7 @@
   "Sha":"commitSha",
   "AssemblyVersion":"1.2.3.0",
   "AssemblyFileVersion":"1.2.3.0",
-  "OriginalRelease":"originalCommitSha.2014-03-01 00:00:01Z"
+  "OriginalRelease":"originalCommitSha.2014-03-01 00:00:01Z",
+  "NuGetVersionV2":"1.2.3-unstable0004",
+  "NuGetVersion":"1.2.3-unstable0004"
 }

Tests/SemanticVersionPreReleaseTagTests.cs

@@ -0,0 +1,19 @@
+using System;
+using GitVersion;
+using NUnit.Framework;
+
+[TestFixture]
+internal class SemanticVersionPreReleaseTagTests
+{
+    [TestCase("Beta")]
+    [TestCase("beta")]
+    public void AlwaysProducesLowercaseName(string versionString)
+    {
+        var tagWithConstructor = new SemanticVersionPreReleaseTag(versionString, 0);
+        var tagWithProperty = new SemanticVersionPreReleaseTag(versionString, 0);
+        tagWithConstructor.Name = versionString;
+
+        Assert.IsTrue(string.Equals("beta", tagWithConstructor.Name, StringComparison.Ordinal));
+        Assert.IsTrue(string.Equals("beta", tagWithProperty.Name, StringComparison.Ordinal));
+    }
+}

Tests/Tests.csproj

@@ -91,6 +91,7 @@
     <Compile Include="BuildServers\BuildServerBaseTests.cs" />
     <Compile Include="BuildServers\TeamCityTests.cs" />
     <Compile Include="BuildServers\ContinuaCiTests.cs" />
+    <Compile Include="SemanticVersionPreReleaseTagTests.cs" />
     <Compile Include="VersionAndBranchFinderTests.cs" />
     <Compile Include="GitHubFlow\MergedBranchesWithVersionFinderTests.cs" />
     <Compile Include="LambdaEqualityHelperFixture.cs" />
@@ -142,6 +143,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_None.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt" />

Tests/VariableProviderTests.cs

@@ -72,5 +72,8 @@ public void AssemblyVersion(
 
         vars[VariableProvider.AssemblyVersion].ShouldBe(version);
         vars[VariableProvider.AssemblyFileVersion].ShouldBe(fileVersion);
+
+        vars[VariableProvider.NuGetVersionV2].ShouldBe(vars[VariableProvider.LegacySemVerPadded].ToLower());
+        vars[VariableProvider.NuGetVersion].ShouldBe(vars[VariableProvider.NuGetVersionV2]);
     }
 }