Fixes parameter name in Arguments class

svengeance · svengeance · commit 7b04224540ca · 2020-05-11T19:19:02.000-04:00
diff --git a/src/GitVersionExe.Tests/ArgumentParserTests.cs b/src/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -320,8 +320,8 @@ public void UpdateAssemblyInfoWithFilename()
 
             var arguments = argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateFileNames.Count.ShouldBe(1);
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
         }
 
         [Test]
@@ -337,9 +337,9 @@ public void UpdateAssemblyInfoWithMultipleFilenames()
 
             var arguments = argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateFileNames.Count.ShouldBe(2);
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
         }
 
         [Test]
@@ -360,10 +360,10 @@ public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing()
 
             var arguments = argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo **/*AssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateFileNames.Count.ShouldBe(3);
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(3);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
         }
 
         [Test]
@@ -379,8 +379,8 @@ public void UpdateAssemblyInfoWithRelativeFilename()
 
             var arguments = argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateFileNames.Count.ShouldBe(1);
-            arguments.UpdateFileNames.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
         }
 
         [Test]
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -104,7 +104,7 @@ public Arguments ParseArguments(string[] commandLineArguments)
                 : firstArgument;
 
             arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');
-            arguments.UpdateFileNames = ResolveFiles(arguments.TargetPath, arguments.UpdateFileNames).ToHashSet();
+            arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
             arguments.NoFetch = arguments.NoFetch || buildAgent != null && buildAgent.PreventFetch();
 
             return arguments;
@@ -424,7 +424,7 @@ private static void ParseEnsureAssemblyInfo(Arguments arguments, string value)
                 arguments.EnsureAssemblyInfo = false;
             }
 
-            if (arguments.UpdateFileNames.Count > 1 && arguments.EnsureAssemblyInfo)
+            if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
             {
                 throw new WarningException("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
             }
@@ -504,15 +504,15 @@ private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, s
                 arguments.UpdateAssemblyInfo = true;
                 foreach (var v in values)
                 {
-                    arguments.UpdateFileNames.Add(v);
+                    arguments.UpdateAssemblyInfoFileName.Add(v);
                 }
             }
             else if (!value.IsSwitchArgument())
             {
                 arguments.UpdateAssemblyInfo = true;
                 if (value != null)
                 {
-                    arguments.UpdateFileNames.Add(value);
+                    arguments.UpdateAssemblyInfoFileName.Add(value);
                 }
             }
             else
@@ -524,7 +524,7 @@ private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, s
             {
                 throw new WarningException("Cannot specify both updateprojectfiles and updateassemblyinfo in the same run. Please rerun GitVersion with only one parameter");
             }
-            if (arguments.UpdateFileNames.Count > 1 && arguments.EnsureAssemblyInfo)
+            if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
             {
                 throw new WarningException("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");
             }
@@ -545,15 +545,15 @@ private static void ParseUpdateProjectInfo(Arguments arguments, string value, st
                 arguments.UpdateProjectFiles = true;
                 foreach (var v in values)
                 {
-                    arguments.UpdateFileNames.Add(v);
+                    arguments.UpdateAssemblyInfoFileName.Add(v);
                 }
             }
             else if (!value.IsSwitchArgument())
             {
                 arguments.UpdateProjectFiles = true;
                 if (value != null)
                 {
-                    arguments.UpdateFileNames.Add(value);
+                    arguments.UpdateAssemblyInfoFileName.Add(value);
                 }
             }
             else
diff --git a/src/GitVersionExe/Arguments.cs b/src/GitVersionExe/Arguments.cs
@@ -41,7 +41,7 @@ public class Arguments
         public bool UpdateProjectFiles;
         public bool UpdateAssemblyInfo;
         public bool EnsureAssemblyInfo;
-        public ISet<string> UpdateFileNames = new HashSet<string>();
+        public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
 
         [Obsolete]
         public string Proj;
@@ -65,7 +65,7 @@ public GitVersionOptions ToOptions()
                     UpdateProjectFiles = UpdateProjectFiles,
                     UpdateAssemblyInfo = UpdateAssemblyInfo,
                     EnsureAssemblyInfo = EnsureAssemblyInfo,
-                    Files = UpdateFileNames
+                    Files = UpdateAssemblyInfoFileName
                 },
 
                 Authentication =

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public Arguments ParseArguments(string[] commandLineArguments)`
`104`	`104`	`: firstArgument;`
`105`	`105`
`106`	`106`	`arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');`
`107`		`- arguments.UpdateFileNames = ResolveFiles(arguments.TargetPath, arguments.UpdateFileNames).ToHashSet();`
	`107`	`+ arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();`
`108`	`108`	`arguments.NoFetch = arguments.NoFetch \|\| buildAgent != null && buildAgent.PreventFetch();`
`109`	`109`
`110`	`110`	`return arguments;`
`@@ -424,7 +424,7 @@ private static void ParseEnsureAssemblyInfo(Arguments arguments, string value)`
`424`	`424`	`arguments.EnsureAssemblyInfo = false;`
`425`	`425`	`}`
`426`	`426`
`427`		`- if (arguments.UpdateFileNames.Count > 1 && arguments.EnsureAssemblyInfo)`
	`427`	`+ if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)`
`428`	`428`	`{`
`429`	`429`	`throw new WarningException("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");`
`430`	`430`	`}`
`@@ -504,15 +504,15 @@ private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, s`
`504`	`504`	`arguments.UpdateAssemblyInfo = true;`
`505`	`505`	`foreach (var v in values)`
`506`	`506`	`{`
`507`		`- arguments.UpdateFileNames.Add(v);`
	`507`	`+ arguments.UpdateAssemblyInfoFileName.Add(v);`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`	`else if (!value.IsSwitchArgument())`
`511`	`511`	`{`
`512`	`512`	`arguments.UpdateAssemblyInfo = true;`
`513`	`513`	`if (value != null)`
`514`	`514`	`{`
`515`		`- arguments.UpdateFileNames.Add(value);`
	`515`	`+ arguments.UpdateAssemblyInfoFileName.Add(value);`
`516`	`516`	`}`
`517`	`517`	`}`
`518`	`518`	`else`
`@@ -524,7 +524,7 @@ private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, s`
`524`	`524`	`{`
`525`	`525`	`throw new WarningException("Cannot specify both updateprojectfiles and updateassemblyinfo in the same run. Please rerun GitVersion with only one parameter");`
`526`	`526`	`}`
`527`		`- if (arguments.UpdateFileNames.Count > 1 && arguments.EnsureAssemblyInfo)`
	`527`	`+ if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)`
`528`	`528`	`{`
`529`	`529`	`throw new WarningException("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");`
`530`	`530`	`}`
`@@ -545,15 +545,15 @@ private static void ParseUpdateProjectInfo(Arguments arguments, string value, st`
`545`	`545`	`arguments.UpdateProjectFiles = true;`
`546`	`546`	`foreach (var v in values)`
`547`	`547`	`{`
`548`		`- arguments.UpdateFileNames.Add(v);`
	`548`	`+ arguments.UpdateAssemblyInfoFileName.Add(v);`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`	`else if (!value.IsSwitchArgument())`
`552`	`552`	`{`
`553`	`553`	`arguments.UpdateProjectFiles = true;`
`554`	`554`	`if (value != null)`
`555`	`555`	`{`
`556`		`- arguments.UpdateFileNames.Add(value);`
	`556`	`+ arguments.UpdateAssemblyInfoFileName.Add(value);`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`	`else`