Merge pull request #930 from JakeGinnivan/AppendLinefeedAfterAssemblyInfoAppends

JakeGinnivan · web-flow · commit ce9ef6892e2b · 2016-07-10T09:52:01.000+08:00
When new assemblyinfo attributes are appended, add a linefeed after
diff --git a/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt b/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt
@@ -1,3 +1,3 @@
 [assembly: AssemblyVersion("2.3.1.0")]
 [assembly: AssemblyFileVersion("2.3.1.0")]
-[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
diff --git a/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 [assembly: AssemblyFileVersion("2.3.1.0")]
-[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
diff --git a/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 [assembly: AssemblyFileVersion("2.3.1.0")]
-[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
diff --git a/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt b/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt
@@ -1,3 +1,3 @@
 [<assembly: AssemblyVersion("2.3.1.0")>]
 [<assembly: AssemblyFileVersion("2.3.1.0")>]
-[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
diff --git a/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 [<assembly: AssemblyFileVersion("2.3.1.0")>]
-[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
diff --git a/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 [<assembly: AssemblyFileVersion("2.3.1.0")>]
-[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
diff --git a/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt b/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt
@@ -1,3 +1,3 @@
 <Assembly: AssemblyVersion("2.3.1.0")>
 <Assembly: AssemblyFileVersion("2.3.1.0")>
-<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
diff --git a/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 <Assembly: AssemblyFileVersion("2.3.1.0")>
-<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
diff --git a/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -1,2 +1,2 @@
 <Assembly: AssemblyFileVersion("2.3.1.0")>
-<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
diff --git a/src/GitVersionExe/AssemblyInfoFileUpdate.cs b/src/GitVersionExe/AssemblyInfoFileUpdate.cs
@@ -13,7 +13,7 @@ class AssemblyInfoFileUpdate : IDisposable
     {
         List<Action> restoreBackupTasks = new List<Action>();
         List<Action> cleanupBackupTasks = new List<Action>();
-        
+
         public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVariables variables, IFileSystem fileSystem)
         {
             if (!args.UpdateAssemblyInfo) return;
@@ -48,18 +48,24 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
                 cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));
 
                 var fileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);
+                var appendedAttributes = false;
                 if (!string.IsNullOrWhiteSpace(assemblyVersion))
                 {
-                    fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension);
+                    fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
                 }
-                fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension);
-                fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension);
+                fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+                fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
 
+                if (appendedAttributes)
+                {
+                    // If we appended any attributes, put a new line after them
+                    fileContents += Environment.NewLine;
+                }
                 fileSystem.WriteAllText(assemblyInfoFile.FullName, fileContents);
             }
         }
 
-        static string ReplaceOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension)
+        static string ReplaceOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)
         {
             var assemblyAddFormat = AssemblyVersionInfoTemplates.GetAssemblyInfoAddFormatFor(fileExtension);
 
@@ -70,6 +76,7 @@ static string ReplaceOrAppend(Regex replaceRegex, string inputString, string rep
             else
             {
                 inputString += Environment.NewLine + string.Format(assemblyAddFormat, replaceString);
+                appendedAttributes = true;
             }
 
             return inputString;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[assembly: AssemblyFileVersion("2.3.1.0")]`
`2`		`-[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]`
	`2`	`+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[<assembly: AssemblyFileVersion("2.3.1.0")>]`
`2`		`-[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]`
	`2`	`+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<Assembly: AssemblyFileVersion("2.3.1.0")>`
`2`		`-<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>`
	`2`	`+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class AssemblyInfoFileUpdate : IDisposable`
`13`	`13`	`{`
`14`	`14`	`List<Action> restoreBackupTasks = new List<Action>();`
`15`	`15`	`List<Action> cleanupBackupTasks = new List<Action>();`
`16`		`-`
	`16`	`+`
`17`	`17`	`public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVariables variables, IFileSystem fileSystem)`
`18`	`18`	`{`
`19`	`19`	`if (!args.UpdateAssemblyInfo) return;`
`@@ -48,18 +48,24 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa`
`48`	`48`	`cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));`
`49`	`49`
`50`	`50`	`var fileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);`
	`51`	`+ var appendedAttributes = false;`
`51`	`52`	`if (!string.IsNullOrWhiteSpace(assemblyVersion))`
`52`	`53`	`{`
`53`		`- fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension);`
	`54`	`+ fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);`
`54`	`55`	`}`
`55`		`- fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension);`
`56`		`- fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension);`
	`56`	`+ fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);`
	`57`	`+ fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);`
`57`	`58`
	`59`	`+ if (appendedAttributes)`
	`60`	`+ {`
	`61`	`+ // If we appended any attributes, put a new line after them`
	`62`	`+ fileContents += Environment.NewLine;`
	`63`	`+ }`
`58`	`64`	`fileSystem.WriteAllText(assemblyInfoFile.FullName, fileContents);`
`59`	`65`	`}`
`60`	`66`	`}`
`61`	`67`
`62`		`- static string ReplaceOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension)`
	`68`	`+ static string ReplaceOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)`
`63`	`69`	`{`
`64`	`70`	`var assemblyAddFormat = AssemblyVersionInfoTemplates.GetAssemblyInfoAddFormatFor(fileExtension);`
`65`	`71`
`@@ -70,6 +76,7 @@ static string ReplaceOrAppend(Regex replaceRegex, string inputString, string rep`
`70`	`76`	`else`
`71`	`77`	`{`
`72`	`78`	`inputString += Environment.NewLine + string.Format(assemblyAddFormat, replaceString);`
	`79`	`+ appendedAttributes = true;`
`73`	`80`	`}`
`74`	`81`
`75`	`82`	`return inputString;`