Merge branch 'feature/630-create-assembly-info' of github.com:Philo/GitVersion into feature/630-create-assembly-info

Philo · Philo · commit af904eb1c7d4 · 2016-01-27T13:05:54.000Z
diff --git a/src/GitVersionExe.Tests/ArgumentParserTests.cs b/src/GitVersionExe.Tests/ArgumentParserTests.cs
@@ -247,7 +247,7 @@ public void ensure_assembly_info_false()
         var arguments = ArgumentParser.ParseArguments("-ensureAssemblyInfo false");
         arguments.EnsureAssemblyInfo.ShouldBe(false);
     }
-
+    
     [Test]
     public void dynamicRepoLocation()
     {
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -279,7 +279,6 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     {
                         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");
                     }
-
                     continue;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public void ensure_assembly_info_false()`
`247`	`247`	`var arguments = ArgumentParser.ParseArguments("-ensureAssemblyInfo false");`
`248`	`248`	`arguments.EnsureAssemblyInfo.ShouldBe(false);`
`249`	`249`	`}`
`250`		`-`
	`250`	`+`
`251`	`251`	`[Test]`
`252`	`252`	`public void dynamicRepoLocation()`
`253`	`253`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,6 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`279`	`279`	`{`
`280`	`280`	`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");`
`281`	`281`	`}`
`282`		`-`
`283`	`282`	`continue;`
`284`	`283`	`}`
`285`	`284`