Skip to content

Commit 7997eee

Browse files
jensbrandjensbrand
committed
Replaced Tabs with spaces
1 parent df3b5d3 commit 7997eee

20 files changed

+108
-108
lines changed

‎build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Task("Create-Release-Notes")
124124
.WithCriteria(() => IsMainGitVersionRepo && IsMainGitVersionBranch && !IsPullRequest)
125125
.Does(() =>
126126
{
127-
var githubToken = EnvironmentVariable("GitHubToken");
127+
var githubToken = EnvironmentVariable("GitHubToken");
128128

129129
if(!string.IsNullOrWhiteSpace(githubToken))
130130
{

‎src/GitVersionCore.Tests/ConfigProviderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void CanUpdateAssemblyInformationalVersioningScheme()
172172

173173
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
174174
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
175-
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
175+
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
176176
config.AssemblyInformationalFormat.ShouldBe("{NugetVersion}");
177177
}
178178

@@ -188,7 +188,7 @@ public void CanUpdateAssemblyInformationalVersioningSchemeWithMultipleVariables(
188188

189189
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
190190
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
191-
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
191+
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
192192
config.AssemblyInformationalFormat.ShouldBe("{Major}.{Minor}.{Patch}");
193193
}
194194

@@ -207,7 +207,7 @@ public void CanUpdateAssemblyInformationalVersioningSchemeWithFullSemVer()
207207

208208
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
209209
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
210-
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
210+
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
211211
config.AssemblyInformationalFormat.ShouldBe("{FullSemVer}");
212212
}
213213

@@ -218,7 +218,7 @@ public void CanReadDefaultDocument()
218218
SetupConfigFileContent(text);
219219
var config = ConfigurationProvider.Provide(repoPath, fileSystem);
220220
config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
221-
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
221+
config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
222222
config.AssemblyInformationalFormat.ShouldBe(null);
223223
config.Branches["develop"].Tag.ShouldBe("alpha");
224224
config.Branches["release"].Tag.ShouldBe("beta");

‎src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace GitVersionCore.Tests
88
public class TestEffectiveConfiguration : EffectiveConfiguration
99
{
1010
public TestEffectiveConfiguration(
11-
AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
12-
AssemblyFileVersioningScheme assemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
13-
string assemblyInformationalFormat = null,
11+
AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
12+
AssemblyFileVersioningScheme assemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
13+
string assemblyInformationalFormat = null,
1414
VersioningMode versioningMode = VersioningMode.ContinuousDelivery,
1515
string gitTagPrefix = "v",
1616
string tag = "",

‎src/GitVersionCore/AssemblyFileVersioningScheme.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
namespace GitVersion
22
{
3-
public enum AssemblyFileVersioningScheme
4-
{
5-
MajorMinorPatchTag,
6-
MajorMinorPatch,
7-
MajorMinor,
8-
Major,
9-
None
10-
}
3+
public enum AssemblyFileVersioningScheme
4+
{
5+
MajorMinorPatchTag,
6+
MajorMinorPatch,
7+
MajorMinor,
8+
Major,
9+
None
10+
}
1111
}

‎src/GitVersionCore/AssemblyVersionsGenerator.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ public static string GetAssemblyVersion(
2525
}
2626
}
2727

28-
public static string GetAssemblyFileVersion(
29-
this SemanticVersion sv,
30-
AssemblyFileVersioningScheme scheme)
31-
{
32-
switch (scheme)
33-
{
34-
case AssemblyFileVersioningScheme.Major:
35-
return string.Format("{0}.0.0.0", sv.Major);
36-
case AssemblyFileVersioningScheme.MajorMinor:
37-
return string.Format("{0}.{1}.0.0", sv.Major, sv.Minor);
38-
case AssemblyFileVersioningScheme.MajorMinorPatch:
39-
return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
40-
case AssemblyFileVersioningScheme.MajorMinorPatchTag:
41-
return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);
42-
case AssemblyFileVersioningScheme.None:
43-
return null;
44-
default:
45-
throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
46-
}
47-
}
48-
}
28+
public static string GetAssemblyFileVersion(
29+
this SemanticVersion sv,
30+
AssemblyFileVersioningScheme scheme)
31+
{
32+
switch (scheme)
33+
{
34+
case AssemblyFileVersioningScheme.Major:
35+
return string.Format("{0}.0.0.0", sv.Major);
36+
case AssemblyFileVersioningScheme.MajorMinor:
37+
return string.Format("{0}.{1}.0.0", sv.Major, sv.Minor);
38+
case AssemblyFileVersioningScheme.MajorMinorPatch:
39+
return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
40+
case AssemblyFileVersioningScheme.MajorMinorPatchTag:
41+
return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);
42+
case AssemblyFileVersioningScheme.None:
43+
return null;
44+
default:
45+
throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
46+
}
47+
}
48+
}
4949
}

‎src/GitVersionCore/BuildServers/AppVeyor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
public class AppVeyor : BuildServerBase
88
{
9-
public const string EnvironmentVariableName = "APPVEYOR";
9+
public const string EnvironmentVariableName = "APPVEYOR";
1010

11-
public override bool CanApplyToCurrentContext()
11+
public override bool CanApplyToCurrentContext()
1212
{
13-
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
13+
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
1414
}
1515

1616
public override string GenerateSetVersionMessage(VersionVariables variables)

‎src/GitVersionCore/BuildServers/BuildServerList.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static class BuildServerList
1414
new Jenkins(),
1515
new GitLabCi(),
1616
new VsoAgent(),
17-
new TravisCI(),
17+
new TravisCI(),
1818
};
1919

2020
public static IEnumerable<IBuildServer> GetApplicableBuildServers()

‎src/GitVersionCore/BuildServers/TeamCity.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
public class TeamCity : BuildServerBase
66
{
7-
public const string EnvironmentVariableName = "TEAMCITY_VERSION";
7+
public const string EnvironmentVariableName = "TEAMCITY_VERSION";
88

9-
public override bool CanApplyToCurrentContext()
9+
public override bool CanApplyToCurrentContext()
1010
{
11-
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
11+
return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
1212
}
1313

1414
public override string GetCurrentBranch(bool usingDynamicRepos)

‎src/GitVersionCore/BuildServers/TravisCI.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
using System;
22
namespace GitVersion
33
{
4-
public class TravisCI : BuildServerBase
5-
{
6-
public const string EnvironmentVariableName = "TRAVIS";
4+
public class TravisCI : BuildServerBase
5+
{
6+
public const string EnvironmentVariableName = "TRAVIS";
77

8-
public override bool CanApplyToCurrentContext ()
9-
{
10-
return "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariableName)) && "true".Equals(Environment.GetEnvironmentVariable("CI"));
11-
}
8+
public override bool CanApplyToCurrentContext ()
9+
{
10+
return "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariableName)) && "true".Equals(Environment.GetEnvironmentVariable("CI"));
11+
}
1212

13-
public override string GenerateSetVersionMessage(VersionVariables variables)
14-
{
15-
return variables.FullSemVer;
16-
}
13+
public override string GenerateSetVersionMessage(VersionVariables variables)
14+
{
15+
return variables.FullSemVer;
16+
}
1717

18-
public override string[] GenerateSetParameterMessage(string name, string value)
19-
{
20-
return new[]
21-
{
22-
string.Format("GitVersion_{0}={1}", name, value)
23-
};
24-
}
18+
public override string[] GenerateSetParameterMessage(string name, string value)
19+
{
20+
return new[]
21+
{
22+
string.Format("GitVersion_{0}={1}", name, value)
23+
};
24+
}
2525

26-
public override bool PreventFetch ()
27-
{
28-
return true;
29-
}
30-
}
26+
public override bool PreventFetch ()
27+
{
28+
return true;
29+
}
30+
}
3131
}
3232

‎src/GitVersionCore/Configuration/Config.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public Config()
1818
[YamlMember(Alias = "assembly-versioning-scheme")]
1919
public AssemblyVersioningScheme? AssemblyVersioningScheme { get; set; }
2020

21-
[YamlMember(Alias = "assembly-file-versioning-scheme")]
22-
public AssemblyFileVersioningScheme? AssemblyFileVersioningScheme { get; set; }
21+
[YamlMember(Alias = "assembly-file-versioning-scheme")]
22+
public AssemblyFileVersioningScheme? AssemblyFileVersioningScheme { get; set; }
2323

2424
[YamlMember(Alias = "assembly-informational-format")]
2525
public string AssemblyInformationalFormat { get; set; }

‎src/GitVersionCore/EffectiveConfiguration.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class EffectiveConfiguration
1010
{
1111
public EffectiveConfiguration(
1212
AssemblyVersioningScheme assemblyVersioningScheme,
13-
AssemblyFileVersioningScheme assemblyFileVersioningScheme,
13+
AssemblyFileVersioningScheme assemblyFileVersioningScheme,
1414
string assemblyInformationalFormat,
1515
VersioningMode versioningMode, string gitTagPrefix,
1616
string tag, string nextVersion, IncrementStrategy increment,
@@ -32,7 +32,7 @@ public EffectiveConfiguration(
3232
bool isCurrentBranchRelease)
3333
{
3434
AssemblyVersioningScheme = assemblyVersioningScheme;
35-
AssemblyFileVersioningScheme = assemblyFileVersioningScheme;
35+
AssemblyFileVersioningScheme = assemblyFileVersioningScheme;
3636
AssemblyInformationalFormat = assemblyInformationalFormat;
3737
VersioningMode = versioningMode;
3838
GitTagPrefix = gitTagPrefix;
@@ -53,8 +53,8 @@ public EffectiveConfiguration(
5353
BuildMetaDataPadding = buildMetaDataPadding;
5454
CommitsSinceVersionSourcePadding = commitsSinceVersionSourcePadding;
5555
VersionFilters = versionFilters;
56-
TracksReleaseBranches = tracksReleaseBranches;
57-
IsCurrentBranchRelease = isCurrentBranchRelease;
56+
TracksReleaseBranches = tracksReleaseBranches;
57+
IsCurrentBranchRelease = isCurrentBranchRelease;
5858
}
5959

6060
public bool TracksReleaseBranches { get; private set; }
@@ -63,7 +63,7 @@ public EffectiveConfiguration(
6363
public VersioningMode VersioningMode { get; private set; }
6464

6565
public AssemblyVersioningScheme AssemblyVersioningScheme { get; private set; }
66-
public AssemblyFileVersioningScheme AssemblyFileVersioningScheme { get; private set; }
66+
public AssemblyFileVersioningScheme AssemblyFileVersioningScheme { get; private set; }
6767
public string AssemblyInformationalFormat { get; private set; }
6868

6969
/// <summary>

‎src/GitVersionCore/GitVersionContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ void CalculateEffectiveConfiguration()
100100

101101
if (!FullConfiguration.AssemblyVersioningScheme.HasValue)
102102
throw new Exception("Configuration value for 'AssemblyVersioningScheme' has no value. (this should not happen, please report an issue)");
103-
if (!FullConfiguration.AssemblyFileVersioningScheme.HasValue)
104-
throw new Exception("Configuration value for 'AssemblyFileVersioningScheme' has no value. (this should not happen, please report an issue)");
103+
if (!FullConfiguration.AssemblyFileVersioningScheme.HasValue)
104+
throw new Exception("Configuration value for 'AssemblyFileVersioningScheme' has no value. (this should not happen, please report an issue)");
105105
if (!FullConfiguration.CommitMessageIncrementing.HasValue)
106106
throw new Exception("Configuration value for 'CommitMessageIncrementing' has no value. (this should not happen, please report an issue)");
107107
if (!FullConfiguration.LegacySemVerPadding.HasValue)
@@ -120,7 +120,7 @@ void CalculateEffectiveConfiguration()
120120

121121
var nextVersion = FullConfiguration.NextVersion;
122122
var assemblyVersioningScheme = FullConfiguration.AssemblyVersioningScheme.Value;
123-
var assemblyFileVersioningScheme = FullConfiguration.AssemblyFileVersioningScheme.Value;
123+
var assemblyFileVersioningScheme = FullConfiguration.AssemblyFileVersioningScheme.Value;
124124
var assemblyInformationalFormat = FullConfiguration.AssemblyInformationalFormat;
125125
var gitTagPrefix = FullConfiguration.TagPrefix;
126126
var majorMessage = FullConfiguration.MajorVersionBumpMessage;

‎src/GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
7676
semverFormatValues.LegacySemVerPadded,
7777
semverFormatValues.FullSemVer,
7878
semverFormatValues.AssemblySemVer,
79-
semverFormatValues.AssemblyFileSemVer,
79+
semverFormatValues.AssemblyFileSemVer,
8080
semverFormatValues.PreReleaseTag,
8181
semverFormatValues.PreReleaseTagWithDash,
8282
semverFormatValues.PreReleaseLabel,

‎src/GitVersionCore/OutputVariables/VersionVariables.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public VersionVariables(string major,
2525
string legacySemVerPadded,
2626
string fullSemVer,
2727
string assemblySemVer,
28-
string assemblySemFileVer,
28+
string assemblySemFileVer,
2929
string preReleaseTag,
3030
string preReleaseTagWithDash,
3131
string preReleaseLabel,
@@ -53,7 +53,7 @@ public VersionVariables(string major,
5353
LegacySemVerPadded = legacySemVerPadded;
5454
FullSemVer = fullSemVer;
5555
AssemblySemVer = assemblySemVer;
56-
AssemblySemFileVer = assemblySemFileVer;
56+
AssemblySemFileVer = assemblySemFileVer;
5757
PreReleaseTag = preReleaseTag;
5858
PreReleaseTagWithDash = preReleaseTagWithDash;
5959
PreReleaseLabel = preReleaseLabel;
@@ -83,7 +83,7 @@ public VersionVariables(string major,
8383
public string LegacySemVer { get; private set; }
8484
public string LegacySemVerPadded { get; private set; }
8585
public string AssemblySemVer { get; private set; }
86-
public string AssemblySemFileVer { get; private set; }
86+
public string AssemblySemFileVer { get; private set; }
8787
public string FullSemVer { get; private set; }
8888
public string InformationalVersion { get; private set; }
8989
public string BranchName { get; private set; }

‎src/GitVersionCore/SemanticVersionFormatValues.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ public string AssemblySemVer
8787
{
8888
get { return _semver.GetAssemblyVersion(_config.AssemblyVersioningScheme); }
8989
}
90-
public string AssemblyFileSemVer
91-
{
92-
get { return _semver.GetAssemblyFileVersion(_config.AssemblyFileVersioningScheme); }
93-
}
90+
public string AssemblyFileSemVer
91+
{
92+
get { return _semver.GetAssemblyFileVersion(_config.AssemblyFileVersioningScheme); }
93+
}
9494

9595
public string FullSemVer
9696
{

‎src/GitVersionExe/AssemblyInfoFileUpdate.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
4949

5050
var fileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);
5151
var appendedAttributes = false;
52-
if (!string.IsNullOrWhiteSpace(assemblyVersion))
53-
{
54-
fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
55-
}
56-
if (!string.IsNullOrWhiteSpace(assemblyFileVersion))
57-
{
58-
fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
59-
}
60-
fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
52+
if (!string.IsNullOrWhiteSpace(assemblyVersion))
53+
{
54+
fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
55+
}
56+
if (!string.IsNullOrWhiteSpace(assemblyFileVersion))
57+
{
58+
fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
59+
}
60+
fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
6161

6262
if (appendedAttributes)
6363
{

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static void VerifyAssemblyVersion(ICompiler compiler, AssemblyVersioningScheme a
269269
Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
270270
}
271271

272-
static void VerifyGitVersionInformationAttribute(Assembly assembly, VersionVariables versionVariables)
272+
static void VerifyGitVersionInformationAttribute(Assembly assembly, VersionVariables versionVariables)
273273
{
274274
var gitVersionInformation = assembly.GetType("Fake.GitVersionInformation");
275275
var fields = gitVersionInformation.GetFields(BindingFlags.Static | BindingFlags.Public);

‎src/GitVersionTask.Tests/AssemblyLocation.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
public static class AssemblyLocation
55
{
6-
public static string CurrentDirectory()
7-
{
8-
var assembly = typeof(AssemblyLocation).Assembly;
9-
var uri = new UriBuilder(assembly.CodeBase);
10-
var path = Uri.UnescapeDataString(uri.Path);
6+
public static string CurrentDirectory()
7+
{
8+
var assembly = typeof(AssemblyLocation).Assembly;
9+
var uri = new UriBuilder(assembly.CodeBase);
10+
var path = Uri.UnescapeDataString(uri.Path);
1111

12-
return Path.GetDirectoryName(path);
13-
}
12+
return Path.GetDirectoryName(path);
13+
}
1414
}

0 commit comments

Comments
 (0)