cleanup

Author: arturcic

src/GitVersionCore/Core/GitVersionTool.cs

@@ -90,11 +90,11 @@ public void UpdateAssemblyInfo(VersionVariables variables)
         {
             var gitVersionOptions = options.Value;
 
-            if (gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo)
+            if (gitVersionOptions.AssemblyInfo.ShouldUpdate)
             {
                 using (assemblyInfoFileUpdater)
                 {
-                    assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo, gitVersionOptions.AssemblyInfo.AssemblyInfoFiles.ToArray()));
+                    assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo, gitVersionOptions.AssemblyInfo.Files.ToArray()));
                 }
             }
         }
@@ -103,7 +103,7 @@ public void UpdateWixVersionFile(VersionVariables variables)
         {
             var gitVersionOptions = options.Value;
 
-            if (gitVersionOptions.WixInfo.UpdateWixVersionFile)
+            if (gitVersionOptions.WixInfo.ShouldUpdate)
             {
                 using (wixVersionFileUpdater)
                 {

src/GitVersionCore/Model/AssemblyInfo.cs

@@ -4,8 +4,8 @@ namespace GitVersion
 {
     public class AssemblyInfo
     {
-        public bool UpdateAssemblyInfo;
-        public ISet<string> AssemblyInfoFiles = new HashSet<string>();
+        public bool ShouldUpdate;
         public bool EnsureAssemblyInfo;
+        public ISet<string> Files = new HashSet<string>();
     }
 }

src/GitVersionCore/Model/WixInfo.cs

@@ -2,6 +2,6 @@ namespace GitVersion
 {
     public class WixInfo
     {
-        public bool UpdateWixVersionFile;
+        public bool ShouldUpdate;
     }
 }

src/GitVersionExe/ArgumentParser.cs

@@ -212,13 +212,13 @@ public Arguments ParseArguments(string[] commandLineArguments)
                         arguments.UpdateAssemblyInfo = true;
                         foreach (var v in values)
                         {
-                            arguments.AddAssemblyInfoFileName(v);
+                            arguments.UpdateAssemblyInfoFileName.Add(v);
                         }
                     }
                     else if (!value.IsSwitchArgument())
                     {
                         arguments.UpdateAssemblyInfo = true;
-                        arguments.AddAssemblyInfoFileName(value);
+                        arguments.UpdateAssemblyInfoFileName.Add(value);
                     }
                     else
                     {

src/GitVersionExe/Arguments.cs

@@ -16,6 +16,8 @@ public class Arguments
 
         public string TargetPath;
 
+        public bool UpdateWixVersionFile;
+
         public string TargetUrl;
         public string TargetBranch;
         public string CommitId;
@@ -25,35 +27,28 @@ public class Arguments
         public bool Diag;
         public bool IsVersion;
         public bool IsHelp;
-        public string LogFilePath;
-        public string ShowVariable;
-
-        [Obsolete]
-        public string Proj;
-        [Obsolete]
-        public string ProjArgs;
-        [Obsolete]
-        public string Exec;
-        [Obsolete]
-        public string ExecArgs;
-
-        public bool UpdateWixVersionFile;
 
         public bool NoFetch;
         public bool NoCache;
         public bool NoNormalize;
 
+        public string LogFilePath;
+        public string ShowVariable;
         public ISet<OutputType> Output = new HashSet<OutputType>();
         public Verbosity Verbosity = Verbosity.Normal;
 
         public bool UpdateAssemblyInfo;
         public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
         public bool EnsureAssemblyInfo;
 
-        public void AddAssemblyInfoFileName(string fileName)
-        {
-            UpdateAssemblyInfoFileName.Add(fileName);
-        }
+        [Obsolete]
+        public string Proj;
+        [Obsolete]
+        public string ProjArgs;
+        [Obsolete]
+        public string Exec;
+        [Obsolete]
+        public string ExecArgs;
 
         public GitVersionOptions ToOptions()
         {
@@ -63,9 +58,9 @@ public GitVersionOptions ToOptions()
 
                 AssemblyInfo =
                 {
-                    UpdateAssemblyInfo = UpdateAssemblyInfo,
+                    ShouldUpdate = UpdateAssemblyInfo,
                     EnsureAssemblyInfo = EnsureAssemblyInfo,
-                    AssemblyInfoFiles = UpdateAssemblyInfoFileName,
+                    Files = UpdateAssemblyInfoFileName,
                 },
 
                 Authentication =
@@ -92,7 +87,7 @@ public GitVersionOptions ToOptions()
 
                 WixInfo =
                 {
-                    UpdateWixVersionFile = UpdateWixVersionFile,
+                    ShouldUpdate = UpdateWixVersionFile,
                 },
 
                 Init = Init,

src/GitVersionTask/GitVersionTaskExecutor.cs

@@ -37,10 +37,10 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
             task.AssemblyInfoTempFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
             var gitVersionOptions = options.Value;
-            gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo = true;
+            gitVersionOptions.AssemblyInfo.ShouldUpdate = true;
             gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo = true;
             gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
-            gitVersionOptions.AssemblyInfo.AssemblyInfoFiles.Add(fileWriteInfo.FileName);
+            gitVersionOptions.AssemblyInfo.Files.Add(fileWriteInfo.FileName);
             gitVersionTool.UpdateAssemblyInfo(versionVariables);
         }