Use AssemblyVersioningScheme.None in configuration rather than command-line switch

Author: Oren Novotny

src/GitVersionCore/AssemblyVersioningScheme.cs

@@ -5,6 +5,7 @@ public enum AssemblyVersioningScheme
         MajorMinorPatchTag,
         MajorMinorPatch,
         MajorMinor,
-        Major
+        Major,
+        None
     }
 }

src/GitVersionCore/AssemblyVersionsGenerator.cs

@@ -18,6 +18,8 @@ public static string GetAssemblyVersion(
                     return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
                 case AssemblyVersioningScheme.MajorMinorPatchTag:
                     return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);
+                case AssemblyVersioningScheme.None:
+                    return null;
                 default:
                     throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
             }

src/GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs

@@ -33,6 +33,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag;
                     steps.Enqueue(new EditConfigStep(Console, FileSystem));
                     return StepResult.Ok();
+                case "5":
+                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.None;
+                    steps.Enqueue(new EditConfigStep(Console, FileSystem));
+                    return StepResult.Ok();
             }
 
             return StepResult.InvalidResponseSelected();
@@ -46,7 +50,9 @@ protected override string GetPrompt(Config config, string workingDirectory)
 1) Major.0.0.0
 2) Major.Minor.0.0
 3) Major.Minor.Patch.0   (default)
-4) Major.Minor.Patch.TagCount (Allows different pre-release tags to cause assembly version to change)";
+4) Major.Minor.Patch.TagCount (Allows different pre-release tags to cause assembly version to change)
+5) None (skip's updating AssemblyVersion)";
+
         }
 
         protected override string DefaultResult

src/GitVersionExe.Tests/ArgumentParserTests.cs

@@ -187,15 +187,6 @@ public void update_assembly_info_true(string command)
         arguments.UpdateAssemblyInfo.ShouldBe(true);
     }
 
-    [TestCase("-excludeUpdateAssemblyVersion true")]
-    [TestCase("-excludeUpdateAssemblyVersion 1")]
-    [TestCase("-excludeUpdateAssemblyVersion")]
-    public void exclude_update_assembly_version_True(string command)
-    {
-        var arguments = ArgumentParser.ParseArguments(command);
-        arguments.ExcludeUpdateAssemblyVersion.ShouldBe(true);
-    }
-
     [TestCase("-updateAssemblyInfo false")]
     [TestCase("-updateAssemblyInfo 0")]
     public void update_assembly_info_false(string command)

src/GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs

@@ -212,17 +212,16 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
     [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
     [Category("NoMono")]
     [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
-    public void ShouldNotReplaceAssemblyVersionWhenExcluded(string fileExtension, string assemblyFileContent)
+    public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
         var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
 
-        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
         {
             var args = new Arguments
             {
                 UpdateAssemblyInfo = true,
-                ExcludeUpdateAssemblyVersion = true,
                 UpdateAssemblyInfoFileName = new HashSet<string>
                 {
                     "AssemblyInfo." + fileExtension
@@ -451,17 +450,16 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
     [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
     [Category("NoMono")]
     [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
-    public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenExcluded(string fileExtension, string assemblyFileContent)
+    public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
     {
         var workingDir = Path.GetTempPath();
         var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
 
-        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
         {
             var args = new Arguments
             {
                 UpdateAssemblyInfo = true,
-                ExcludeUpdateAssemblyVersion = true,
                 UpdateAssemblyInfoFileName = new HashSet<string>
                 {
                     "AssemblyInfo." + fileExtension

src/GitVersionExe.Tests/HelpWriterTests.cs

@@ -16,7 +16,6 @@ public void AllArgsAreInHelp()
             { "TargetBranch", "/b" },
             { "LogFilePath" , "/l" },
             { "DynamicRepositoryLocation" , "/dynamicRepoLocation" },
-            { "ExcludeUpdateAssemblyVersion" , "/excludeUpdateAssemblyVersion" },
             { "IsHelp", "/?" }
         };
         string helpText = null;

src/GitVersionExe/ArgumentParser.cs

@@ -186,24 +186,6 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     continue;
                 }
 
-                if (name.IsSwitch("excludeUpdateAssemblyVersion"))
-                {
-                    if (value.IsTrue())
-                    {
-                        arguments.ExcludeUpdateAssemblyVersion = true;
-                    }
-                    else if (value.IsFalse())
-                    {
-                        arguments.ExcludeUpdateAssemblyVersion = false;
-                    }
-                    else
-                    {
-                        arguments.ExcludeUpdateAssemblyVersion = true;
-                    }
-
-                    continue;
-                }
-
                 if (name.IsSwitch("assemblyversionformat"))
                 {
                     throw new WarningException("assemblyversionformat switch removed, use AssemblyVersioningScheme configuration value instead");

src/GitVersionExe/Arguments.cs

@@ -37,7 +37,6 @@ public Arguments()
         public string ExecArgs;
 
         public bool UpdateAssemblyInfo;
-        public bool ExcludeUpdateAssemblyVersion;
         public ISet<string> UpdateAssemblyInfoFileName;
         public bool EnsureAssemblyInfo;
 

src/GitVersionExe/AssemblyInfoFileUpdate.cs

@@ -26,7 +26,7 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
 
             var assemblyVersion = variables.AssemblySemVer;
             var assemblyVersionRegex = new Regex(@"AssemblyVersion\s*\(\s*""[^""]*""\s*\)");
-            var assemblyVersionString = string.Format("AssemblyVersion(\"{0}\")", assemblyVersion);
+            var assemblyVersionString = assemblyVersion != null ? string.Format("AssemblyVersion(\"{0}\")", assemblyVersion) : null;
             var assemblyInfoVersion = variables.InformationalVersion;
             var assemblyInfoVersionRegex = new Regex(@"AssemblyInformationalVersion\s*\(\s*""[^""]*""\s*\)");
             var assemblyInfoVersionString = string.Format("AssemblyInformationalVersion(\"{0}\")", assemblyInfoVersion);
@@ -48,7 +48,7 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
                 cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));
 
                 var fileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);
-                if (!args.ExcludeUpdateAssemblyVersion)
+                if (assemblyVersion != null)
                 {
                     fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension);
                 }

src/GitVersionExe/HelpWriter.cs

@@ -31,8 +31,6 @@ path            The directory containing .git. If not defined current directory
     # AssemblyInfo updating
     /updateassemblyinfo
                     Will recursively search for all 'AssemblyInfo.cs' files in the git repo and update them
-    /excludeUpdateAssemblyVersion
-                    Will exclude adding or updating the AssemblyVersion attribute when updating assembly info files
     /updateassemblyinfofilename
                     Specify name of AssemblyInfo file. Can also /updateAssemblyInfo GlobalAssemblyInfo.cs as a shorthand
     /ensureassemblyinfo