Skip to content

Commit f7db56e

Browse files
asbjornuJakeGinnivan
authored andcommitted
Remove extranous whitespace from the generated AssemblyInfo file
1 parent 13ad05d commit f7db56e

6 files changed

+20
-22
lines changed

src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-

2-
using System;
1+
using System;
32
using System.Reflection;
43

54
[assembly: AssemblyVersion("2.0.0.0")]
@@ -42,6 +41,5 @@ namespace Fake
4241
public static string NuGetVersionV2 = "2.3.4-beta0005";
4342
public static string NuGetVersion = "2.3.4-beta0005";
4443
public static string CommitDate = "2014-03-06";
45-
4644
}
4745
}

src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-

2-
using System;
1+
using System;
32
using System.Reflection;
43

54
[assembly: AssemblyVersion("2.3.0.0")]
@@ -42,6 +41,5 @@ namespace Fake
4241
public static string NuGetVersionV2 = "2.3.4-beta0005";
4342
public static string NuGetVersion = "2.3.4-beta0005";
4443
public static string CommitDate = "2014-03-06";
45-
4644
}
4745
}

src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-

2-
using System;
1+
using System;
32
using System.Reflection;
43

54
[assembly: AssemblyVersion("2.3.4.0")]
@@ -42,6 +41,5 @@ namespace Fake
4241
public static string NuGetVersionV2 = "2.3.4-beta0005";
4342
public static string NuGetVersion = "2.3.4-beta0005";
4443
public static string CommitDate = "2014-03-06";
45-
4644
}
4745
}

src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-

2-
using System;
1+
using System;
32
using System.Reflection;
43

54
[assembly: AssemblyVersion("2.3.4.5")]
@@ -42,6 +41,5 @@ namespace Fake
4241
public static string NuGetVersionV2 = "2.3.4-beta0005";
4342
public static string NuGetVersion = "2.3.4-beta0005";
4443
public static string CommitDate = "2014-03-06";
45-
4644
}
4745
}

src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-

2-
using System;
1+
using System;
32
using System.Reflection;
43

54
[assembly: AssemblyVersion("1.2.3.0")]
@@ -42,6 +41,5 @@ namespace Fake
4241
public static string NuGetVersionV2 = "1.2.3-unstable0004";
4342
public static string NuGetVersion = "1.2.3-unstable0004";
4443
public static string CommitDate = "2014-03-06";
45-
4644
}
4745
}

src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Linq;
23
using System.Text;
34

45
using GitVersion;
@@ -7,8 +8,10 @@ public class AssemblyInfoBuilder
78
{
89
public string GetAssemblyInfoText(VersionVariables vars, string assemblyName)
910
{
10-
var assemblyInfo = string.Format(@"
11-
using System;
11+
var v = vars.ToArray();
12+
13+
var assemblyInfo = string.Format(
14+
@"using System;
1215
using System.Reflection;
1316
1417
[assembly: AssemblyVersion(""{0}"")]
@@ -40,19 +43,24 @@ static class GitVersionInformation
4043
vars.MajorMinorPatch + ".0",
4144
vars.InformationalVersion,
4245
vars.CommitDate,
43-
GenerateVariableMembers(vars),
46+
GenerateVariableMembers(v),
4447
assemblyName);
4548

4649
return assemblyInfo;
4750
}
4851

49-
50-
string GenerateVariableMembers(IEnumerable<KeyValuePair<string, string>> vars)
52+
static string GenerateVariableMembers(IList<KeyValuePair<string, string>> vars)
5153
{
5254
var members = new StringBuilder();
53-
foreach (var variable in vars)
55+
for (var i = 0; i < vars.Count; i++)
5456
{
55-
members.AppendLine(string.Format(" public static string {0} = \"{1}\";", variable.Key, variable.Value));
57+
var variable = vars[i];
58+
members.AppendFormat(" public static string {0} = \"{1}\";", variable.Key, variable.Value);
59+
60+
if (i < vars.Count - 1)
61+
{
62+
members.AppendLine();
63+
}
5664
}
5765

5866
return members.ToString();

0 commit comments

Comments
 (0)