simplify assembly versioing

Author: SimonCropp

GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs

@@ -6,12 +6,9 @@ public class AssemblyInfoBuilder
 {
     public SemanticVersion SemanticVersion;
     public AssemblyVersioningScheme AssemblyVersioningScheme;
-    public bool AppendRevision;
 
     public string GetAssemblyInfoText()
     {
-        var assemblyMetaData = AssemblyVersionsGenerator.Process(SemanticVersion, AssemblyVersioningScheme, AppendRevision);
-
         var vars = VariableProvider.GetVariablesFor(SemanticVersion);
         var assemblyInfo = string.Format(@"
 using System;
@@ -42,7 +39,7 @@ static class GitVersionInformation
 }}
 
 
-", assemblyMetaData.Version, assemblyMetaData.FileVersion, SemanticVersion.ToString("i"),
+", SemanticVersion.GetAssemblyVersion(AssemblyVersioningScheme), string.Format("{0}.{1}.{2}.0", SemanticVersion.Major, SemanticVersion.Minor, SemanticVersion.Patch), SemanticVersion.ToString("i"),
             SemanticVersion.BuildMetaData.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
             SemanticVersion.BuildMetaData.ReleaseDate.Date.UtcDateTime.ToString("yyyy-MM-dd"),
             GenerateVariableMembers(vars));

GitVersionTask/AssemblyInfoBuilder/AssemblyMetaData.cs

@@ -4,45 +4,22 @@
 
 public static class AssemblyVersionsGenerator
 {
-    public static AssemblyMetaData Process(
-        SemanticVersion sv,
-        AssemblyVersioningScheme scheme,
-        bool addNumberOfCommitsSinceTagOnMasterBranchToFileVersion)
+    public static string GetAssemblyVersion(
+        this SemanticVersion sv,
+        AssemblyVersioningScheme scheme)
     {
-        var fileVersion = GetStrictAssemblyFileVersion(sv, addNumberOfCommitsSinceTagOnMasterBranchToFileVersion);
-        string version;
-
         switch (scheme)
         {
             case AssemblyVersioningScheme.Major:
-                version = string.Format("{0}.0.0.0", sv.Major);
-                break;
-
+                return string.Format("{0}.0.0.0", sv.Major);
             case AssemblyVersioningScheme.MajorMinor:
-                version = string.Format("{0}.{1}.0.0", sv.Major, sv.Minor);
-                break;
-
+                return string.Format("{0}.{1}.0.0", sv.Major, sv.Minor);
             case AssemblyVersioningScheme.MajorMinorPatch:
-                version = GetStrictAssemblyFileVersion(sv, false);
-                break;
-
+                return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
             default:
                 throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
         }
 
-        return new AssemblyMetaData(version, fileVersion);
     }
 
-    static string GetStrictAssemblyFileVersion(SemanticVersion sv, bool appendRevision)
-    {
-        if (appendRevision && sv.BuildMetaData.Branch == "master")
-        {
-            if (sv.BuildMetaData.CommitsSinceTag != null)
-            {
-                return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.BuildMetaData.CommitsSinceTag);
-            }
-        }
-
-        return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
-    }
 }

GitVersionTask/AssemblyInfoBuilder/AssemblyVersionsGenerator.cs

@@ -9,8 +9,6 @@
 
     public class UpdateAssemblyInfo : Task
     {
-        public bool AppendRevision { get; set; }
-
         public string AssemblyVersioningScheme { get; set; }
 
         [Required]
@@ -107,7 +105,6 @@ void CreateTempAssemblyInfo(SemanticVersion semanticVersion)
                                       {
                                           SemanticVersion = semanticVersion,
                                           AssemblyVersioningScheme = versioningScheme,
-                                          AppendRevision = AppendRevision
                                       };
             var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText();
 

GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

@@ -55,7 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfoBuilder\AssemblyInfoBuilder.cs" />
-    <Compile Include="AssemblyInfoBuilder\AssemblyMetaData.cs" />
     <Compile Include="AssemblyInfoBuilder\AssemblyVersioningScheme.cs" />
     <Compile Include="AssemblyInfoBuilder\AssemblyVersionsGenerator.cs" />
     <Compile Include="BuildLogger.cs" />

GitVersionTask/GitVersionTask.csproj

@@ -4,7 +4,6 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup>
-    <GitVersionAppendRevision Condition="$(GitVersionAppendRevision) == '' Or $(GitVersionAppendRevision) == '*Undefined*'">false</GitVersionAppendRevision>
     <GitVersionAssemblyVersioningScheme Condition="$(GitVersionAssemblyVersioningScheme) == '' Or $(GitVersionAssemblyVersioningScheme) == '*Undefined*'"></GitVersionAssemblyVersioningScheme>
   </PropertyGroup>
 
@@ -26,7 +25,6 @@
     <UpdateAssemblyInfo
       SolutionDirectory="$(SolutionDir)"
       ProjectFile="$(ProjectPath)"
-      AppendRevision="$(GitVersionAppendRevision)"
       AssemblyVersioningScheme="$(GitVersionAssemblyVersioningScheme)"
       CompileFiles ="@(Compile)">
       <Output