Skip to content

Commit ba059b2

Browse files
committed
Renamed VersionVariables -> GitVersionVariables
1 parent 27d4d0c commit ba059b2

File tree

58 files changed

+145
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+145
-145
lines changed

src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private class MockBuildAgent : ICurrentBuildAgent
3434
public bool IsDefault => false;
3535
public bool CanApplyToCurrentContext() => throw new NotImplementedException();
3636

37-
public void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
37+
public void WriteIntegration(Action<string> writer, GitVersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
3838

3939
public string GetCurrentBranch(bool usingDynamicRepos) => throw new NotImplementedException();
4040

src/GitVersion.App.Tests/Helpers/ExecutionResults.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public ExecutionResults(int exitCode, string output, string? logContents)
1515
public string Output { get; }
1616
public string? Log { get; }
1717

18-
public virtual VersionVariables OutputVariables
18+
public virtual GitVersionVariables OutputVariables
1919
{
2020
get
2121
{

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class ProgramFixtureResult
8080
public string? Output { get; set; }
8181
public string Log { get; set; }
8282

83-
public VersionVariables? OutputVariables
83+
public GitVersionVariables? OutputVariables
8484
{
8585
get
8686
{

src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void WixVersionFileVarCountTest()
3737
GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
3838

3939
var gitVersionVarsInWix = GetGitVersionVarsInWixFile(PathHelper.Combine(fixture.RepositoryPath, this.wixVersionFileName));
40-
var gitVersionVars = VersionVariables.AvailableVariables;
40+
var gitVersionVars = GitVersionVariables.AvailableVariables;
4141

4242
Assert.That(gitVersionVarsInWix, Has.Count.EqualTo(gitVersionVars.Count()));
4343
}
@@ -55,7 +55,7 @@ public void WixVersionFileContentTest()
5555
GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
5656

5757
var gitVersionVarsInWix = GetGitVersionVarsInWixFile(PathHelper.Combine(fixture.RepositoryPath, this.wixVersionFileName));
58-
var gitVersionVars = VersionVariables.AvailableVariables;
58+
var gitVersionVars = GitVersionVariables.AvailableVariables;
5959

6060
foreach (var variable in gitVersionVars)
6161
{

src/GitVersion.App/ArgumentParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ArgumentParser : IArgumentParser
1313
private readonly IConsole console;
1414
private readonly IGlobbingResolver globbingResolver;
1515
private const string defaultOutputFileName = "GitVersion.json";
16-
private static readonly IEnumerable<string> availableVariables = VersionVariables.AvailableVariables;
16+
private static readonly IEnumerable<string> availableVariables = GitVersionVariables.AvailableVariables;
1717

1818
public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
1919
{

src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void SetEnvironmentVariableForTest()
2828
[Test]
2929
public void DevelopBranch()
3030
{
31-
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
31+
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Unstable4");
3232
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
3333

3434
vsVersion.ShouldBe("##vso[build.updatebuildnumber]Some Build_Value 0.0.0-Unstable4 20151310.3 $(UnknownVar) Release");
@@ -49,7 +49,7 @@ public void MissingEnvShouldNotBlowUp()
4949
this.environment.SetEnvironmentVariable(key, null);
5050

5151
const string semver = "0.0.0-Unstable4";
52-
var vars = new TestableVersionVariables(fullSemVer: semver);
52+
var vars = new TestableGitVersionVariables(fullSemVer: semver);
5353
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
5454
vsVersion.ShouldBe(semver);
5555
}
@@ -61,7 +61,7 @@ public void MissingEnvShouldNotBlowUp()
6161
public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
6262
{
6363
this.environment.SetEnvironmentVariable(key, buildNumberFormat);
64-
var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);
64+
var vars = new TestableGitVersionVariables(fullSemVer: myFullSemVer);
6565
var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
6666
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
6767
}
@@ -73,7 +73,7 @@ public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, st
7373
public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
7474
{
7575
this.environment.SetEnvironmentVariable(key, buildNumberFormat);
76-
var vars = new TestableVersionVariables(semVer: mySemVer);
76+
var vars = new TestableGitVersionVariables(semVer: mySemVer);
7777
var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
7878
logMessage.ShouldBe(logPrefix + expectedBuildNumber);
7979
}

src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void CalculateVersionOnMainBranch()
4141
// Arrange
4242
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/main");
4343

44-
var vars = new TestableVersionVariables(fullSemVer: "1.2.3");
44+
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3");
4545
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
4646

4747
vsVersion.ShouldBe("1.2.3");
@@ -53,7 +53,7 @@ public void CalculateVersionOnDevelopBranch()
5353
// Arrange
5454
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/develop");
5555

56-
var vars = new TestableVersionVariables(fullSemVer: "1.2.3-unstable.4");
56+
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3-unstable.4");
5757
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
5858

5959
vsVersion.ShouldBe("1.2.3-unstable.4");
@@ -65,7 +65,7 @@ public void CalculateVersionOnFeatureBranch()
6565
// Arrange
6666
this.environment.SetEnvironmentVariable(BitBucketPipelines.BranchEnvironmentVariableName, "refs/heads/feature/my-work");
6767

68-
var vars = new TestableVersionVariables(fullSemVer: "1.2.3-beta.4");
68+
var vars = new TestableGitVersionVariables(fullSemVer: "1.2.3-beta.4");
6969
var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
7070

7171
vsVersion.ShouldBe("1.2.3-beta.4");

src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void GetSetParameterMessageShouldReturnEmptyArray()
8686
public void GetEmptyGenerateSetVersionMessage()
8787
{
8888
// Arrange
89-
var vars = new TestableVersionVariables("1.0.0");
89+
var vars = new TestableGitVersionVariables("1.0.0");
9090

9191
// Act
9292
var message = this.buildServer.GenerateSetVersionMessage(vars);

src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
5959

6060
public override bool CanApplyToCurrentContext() => throw new NotImplementedException();
6161

62-
public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
62+
public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
6363

6464
public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
6565
}

src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ContinuaCiTests : TestBase
1515
public void GenerateBuildVersion()
1616
{
1717
var buildServer = this.sp.GetRequiredService<ContinuaCi>();
18-
var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
18+
var vars = new TestableGitVersionVariables(fullSemVer: "0.0.0-Beta4.7");
1919
var continuaCiVersion = buildServer.GenerateSetVersionMessage(vars);
2020
Assert.That(continuaCiVersion, Is.EqualTo("@@continua[setBuildVersion value='0.0.0-Beta4.7']"));
2121
}

0 commit comments

Comments
 (0)