Skip to content

Commit 206ebe2

Browse files
JakeGinnivanJakeGinnivan
committed
Fixed variable naming
1 parent a28c18a commit 206ebe2

File tree

6 files changed

+21
-38
lines changed

6 files changed

+21
-38
lines changed

‎GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

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

55
public class EmptyRepositoryFixture : RepositoryFixtureBase
66
{
7-
public EmptyRepositoryFixture(Config config) :
8-
base(CreateNewRepository, config)
7+
public EmptyRepositoryFixture(Config configuration) :
8+
base(CreateNewRepository, configuration)
99
{
1010
}
1111

‎GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public abstract class RepositoryFixtureBase : IDisposable
88
{
99
public string RepositoryPath;
1010
public IRepository Repository;
11-
Config configuration;
11+
private Config configuration;
1212

1313
protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder, Config configuration)
1414
{

‎GitVersionCore.Tests/IntegrationTests/GitHubFlow/ReleaseBranchTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
7676
[Test]
7777
public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
7878
{
79-
using (var fixture = new EmptyRepositoryFixture())
79+
using (var fixture = new EmptyRepositoryFixture(new Config()))
8080
{
8181
const string TaggedVersion = "1.0.3";
8282
fixture.Repository.MakeATaggedCommit(TaggedVersion);

‎GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public void InnerExecute()
7373
if (string.IsNullOrEmpty(gitDirectory))
7474
return;
7575

76-
var config = ConfigurationProvider.Provide(gitDirectory);
76+
var configuration = ConfigurationProvider.Provide(gitDirectory);
7777
if (!string.IsNullOrEmpty(AssemblyVersioningScheme))
7878
{
7979
AssemblyVersioningScheme versioningScheme;
8080
if (Enum.TryParse(AssemblyVersioningScheme, true, out versioningScheme))
8181
{
82-
config.AssemblyVersioningScheme = versioningScheme;
82+
configuration.AssemblyVersioningScheme = versioningScheme;
8383
}
8484
else
8585
{
@@ -91,51 +91,34 @@ public void InnerExecute()
9191
// Null is intentional. Empty string means the user has set the value to an empty string and wants to clear the tag
9292
if (DevelopBranchTag != null)
9393
{
94-
config.DevelopBranchTag = DevelopBranchTag;
94+
configuration.DevelopBranchTag = DevelopBranchTag;
9595
}
9696

9797
if (ReleaseBranchTag != null)
9898
{
99-
config.ReleaseBranchTag = ReleaseBranchTag;
99+
configuration.ReleaseBranchTag = ReleaseBranchTag;
100100
}
101101

102102
if (TagPrefix != null)
103103
{
104-
config.TagPrefix = TagPrefix;
104+
configuration.TagPrefix = TagPrefix;
105105
}
106106

107107
CachedVersion semanticVersion;
108-
if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, config))
108+
if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, configuration))
109109
{
110110
return;
111111
}
112-
CreateTempAssemblyInfo(semanticVersion, config);
112+
CreateTempAssemblyInfo(semanticVersion, configuration);
113113
}
114114

115-
AssemblyVersioningScheme GetAssemblyVersioningScheme(Config config)
116-
{
117-
if (string.IsNullOrWhiteSpace(AssemblyVersioningScheme))
118-
{
119-
return config.AssemblyVersioningScheme;
120-
}
121-
122-
AssemblyVersioningScheme versioningScheme;
123-
124-
if (Enum.TryParse(AssemblyVersioningScheme, true, out versioningScheme))
125-
{
126-
return versioningScheme;
127-
}
128-
129-
throw new WarningException(string.Format("Unexpected assembly versioning scheme '{0}'.", AssemblyVersioningScheme));
130-
}
131-
132-
void CreateTempAssemblyInfo(CachedVersion semanticVersion, Config config)
115+
void CreateTempAssemblyInfo(CachedVersion semanticVersion, Config configuration)
133116
{
134117
var assemblyInfoBuilder = new AssemblyInfoBuilder
135118
{
136119
CachedVersion = semanticVersion
137120
};
138-
var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(config);
121+
var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(configuration);
139122

140123
var tempFileName = string.Format("AssemblyInfo_{0}_{1}.g.cs", Path.GetFileNameWithoutExtension(ProjectFile), Path.GetRandomFileName());
141124
AssemblyInfoTempFilePath = Path.Combine(TempFileTracker.TempPath, tempFileName);

‎GitVersionTask/GetVersion.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,29 @@ public override bool Execute()
9696
{
9797
CachedVersion versionAndBranch;
9898
var gitDirectory = GitDirFinder.TreeWalkForGitDir(SolutionDirectory);
99-
var config = ConfigurationProvider.Provide(gitDirectory);
99+
var configuration = ConfigurationProvider.Provide(gitDirectory);
100100

101101
// TODO This should be covered by tests
102102
// Null is intentional. Empty string means the user has set the value to an empty string and wants to clear the tag
103103
if (DevelopBranchTag != null)
104104
{
105-
config.DevelopBranchTag = DevelopBranchTag;
105+
configuration.DevelopBranchTag = DevelopBranchTag;
106106
}
107107

108108
if (ReleaseBranchTag != null)
109109
{
110-
config.ReleaseBranchTag = ReleaseBranchTag;
110+
configuration.ReleaseBranchTag = ReleaseBranchTag;
111111
}
112112

113113
if (TagPrefix != null)
114114
{
115-
config.TagPrefix = TagPrefix;
115+
configuration.TagPrefix = TagPrefix;
116116
}
117117

118-
if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch, config))
118+
if (VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionAndBranch, configuration))
119119
{
120120
var thisType = typeof(GetVersion);
121-
var variables = VariableProvider.GetVariablesFor(versionAndBranch.SemanticVersion, config);
121+
var variables = VariableProvider.GetVariablesFor(versionAndBranch.SemanticVersion, configuration);
122122
foreach (var variable in variables)
123123
{
124124
thisType.GetProperty(variable.Key).SetValue(this, variable.Value, null);

‎GitVersionTask/WriteVersionInfoToBuildLog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public void InnerExecute()
4949
{
5050
CachedVersion semanticVersion;
5151
var gitDirectory = GitDirFinder.TreeWalkForGitDir(SolutionDirectory);
52-
var config = ConfigurationProvider.Provide(gitDirectory);
53-
if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, config))
52+
var configuration = ConfigurationProvider.Provide(gitDirectory);
53+
if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out semanticVersion, configuration))
5454
{
5555
return;
5656
}

0 commit comments

Comments
 (0)