Skip to content

Commit 437b5ab

Browse files
Evangelinkarturcic
authored andcommitted
Fix some formatting issues
1 parent aa6f96a commit 437b5ab

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ public class BaseVersionCalculatorTests : TestBase
1818
public void ChoosesHighestVersionReturnedFromStrategies()
1919
{
2020
var dateTimeOffset = DateTimeOffset.Now;
21-
var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder.OverrideServices(services =>
22-
{
23-
services.RemoveAll<IVersionStrategy>();
24-
services.AddSingleton<IVersionStrategy>(new V1Strategy(DateTimeOffset.Now));
25-
services.AddSingleton<IVersionStrategy>(new V2Strategy(dateTimeOffset));
26-
}));
21+
var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
22+
contextBuilder.OverrideServices(services =>
23+
{
24+
services.RemoveAll<IVersionStrategy>();
25+
services.AddSingleton<IVersionStrategy>(new V1Strategy(DateTimeOffset.Now));
26+
services.AddSingleton<IVersionStrategy>(new V2Strategy(dateTimeOffset));
27+
}));
2728

2829
var baseVersion = versionCalculator.GetBaseVersion();
2930

@@ -37,12 +38,13 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
3738
{
3839
var when = DateTimeOffset.Now;
3940

40-
var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder.OverrideServices(services =>
41-
{
42-
services.RemoveAll<IVersionStrategy>();
43-
services.AddSingleton<IVersionStrategy>(new V1Strategy(when));
44-
services.AddSingleton<IVersionStrategy>(new V2Strategy(null));
45-
}));
41+
var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
42+
contextBuilder.OverrideServices(services =>
43+
{
44+
services.RemoveAll<IVersionStrategy>();
45+
services.AddSingleton<IVersionStrategy>(new V1Strategy(when));
46+
services.AddSingleton<IVersionStrategy>(new V2Strategy(null));
47+
}));
4648

4749
var baseVersion = versionCalculator.GetBaseVersion();
4850

@@ -56,12 +58,13 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
5658
{
5759
var when = DateTimeOffset.Now;
5860

59-
var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder.OverrideServices(services =>
60-
{
61-
services.RemoveAll<IVersionStrategy>();
62-
services.AddSingleton<IVersionStrategy>(new V1Strategy(null));
63-
services.AddSingleton<IVersionStrategy>(new V2Strategy(when));
64-
}));
61+
var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
62+
contextBuilder.OverrideServices(services =>
63+
{
64+
services.RemoveAll<IVersionStrategy>();
65+
services.AddSingleton<IVersionStrategy>(new V1Strategy(null));
66+
services.AddSingleton<IVersionStrategy>(new V2Strategy(when));
67+
}));
6568

6669
var baseVersion = versionCalculator.GetBaseVersion();
6770

src/GitVersion.Core/BuildAgents/GitHubActions.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ public GitHubActions(IEnvironment environment, ILog log) : base(environment, log
1919
protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
2020

2121
public override string GenerateSetVersionMessage(VersionVariables variables) =>
22-
// There is no equivalent function in GitHub Actions.
23-
24-
string.Empty;
22+
string.Empty; // There is no equivalent function in GitHub Actions.
2523

2624
public override string[] GenerateSetParameterMessage(string name, string value) =>
27-
// There is no equivalent function in GitHub Actions.
28-
29-
System.Array.Empty<string>();
25+
System.Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
3026

3127
public override void WriteIntegration(System.Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
3228
{

src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,30 @@ public class MsBuildTaskFixture
1818

1919
public void WithEnv(params KeyValuePair<string, string>[] envs) => this.environmentVariables = envs;
2020

21-
public MsBuildTaskFixtureResult<T> Execute<T>(T task) where T : GitVersionTaskBase => UsingEnv(() =>
22-
{
23-
var buildEngine = new MockEngine();
21+
public MsBuildTaskFixtureResult<T> Execute<T>(T task) where T : GitVersionTaskBase =>
22+
UsingEnv(() =>
23+
{
24+
var buildEngine = new MockEngine();
2425

25-
task.BuildEngine = buildEngine;
26+
task.BuildEngine = buildEngine;
2627

27-
var versionFile = Path.Combine(task.SolutionDirectory, "gitversion.json");
28-
this.fixture.WriteVersionVariables(versionFile);
28+
var versionFile = Path.Combine(task.SolutionDirectory, "gitversion.json");
29+
this.fixture.WriteVersionVariables(versionFile);
2930

30-
task.VersionFile = versionFile;
31+
task.VersionFile = versionFile;
3132

32-
var result = task.Execute();
33+
var result = task.Execute();
3334

34-
return new MsBuildTaskFixtureResult<T>(this.fixture)
35-
{
36-
Success = result,
37-
Task = task,
38-
Errors = buildEngine.Errors,
39-
Warnings = buildEngine.Warnings,
40-
Messages = buildEngine.Messages,
41-
Log = buildEngine.Log,
42-
};
43-
});
35+
return new MsBuildTaskFixtureResult<T>(this.fixture)
36+
{
37+
Success = result,
38+
Task = task,
39+
Errors = buildEngine.Errors,
40+
Warnings = buildEngine.Warnings,
41+
Messages = buildEngine.Messages,
42+
Log = buildEngine.Log,
43+
};
44+
});
4445

4546
private T UsingEnv<T>(Func<T> func)
4647
{

0 commit comments

Comments
 (0)