Skip to content

Commit 7fa5eb8

Browse files
jetersenarturcic
authored andcommitted
format
1 parent 631f198 commit 7fa5eb8

File tree

103 files changed

+165
-167
lines changed

Some content is hidden

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

103 files changed

+165
-167
lines changed

src/GitVersionCore.Tests/AssemblyFileVersionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
1818
int tag, string versionString)
1919
{
2020
var semVer = new SemanticVersion(major, minor, patch)
21-
{
22-
PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
23-
};
21+
{
22+
PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
23+
};
2424

2525
var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);
2626

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
using NUnit.Framework;
1+
using NUnit.Framework;
22

3-
[assembly: Parallelizable(ParallelScope.Fixtures)]
3+
[assembly: Parallelizable(ParallelScope.Fixtures)]

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace GitVersionCore.Tests.BuildServers
1212
{
1313
[TestFixture]
14-
public class BuildServerBaseTests : TestBase
14+
public class BuildServerBaseTests : TestBase
1515
{
1616
private IVariableProvider buildServer;
1717
private IServiceProvider sp;

src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
6363
version.ShouldBe(fullSemVer);
6464
}
6565

66-
[TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
66+
[TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
6767
[TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
6868
public void GenerateSetParameterMessage(string name, string value, string expected)
6969
{

src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public void CanApplyCurrentContextWhenenvironmentVariableIsSet()
5050
SetEnvironmentVariableForDetection();
5151
buildServer.CanApplyToCurrentContext().ShouldBe(true);
5252
}
53-
53+
5454
[Test]
5555
public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
5656
{
5757
ClearenvironmentVariableForDetection();
58-
buildServer.CanApplyToCurrentContext().ShouldBe(false);
58+
buildServer.CanApplyToCurrentContext().ShouldBe(false);
5959
}
6060

6161
[Test]

src/GitVersionCore.Tests/BuildServers/TeamCityTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void SetUp()
1919
});
2020
buildServer = sp.GetService<TeamCity>();
2121
}
22-
22+
2323
[Test]
2424
public void DevelopBranch()
2525
{

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Setup()
4040

4141
ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
4242
}
43-
43+
4444
[TestCase(DefaultRepoPath)]
4545
[TestCase(DefaultWorkingPath)]
4646
public void WarnOnExistingGitVersionConfigYamlFile(string path)
@@ -100,12 +100,12 @@ public void NoWarnOnGitVersionYmlFile()
100100

101101
var output = WithDefaultConfigFileLocator(configFileLocator =>
102102
{
103-
configurationProvider.Provide(repoPath);
103+
configurationProvider.Provide(repoPath);
104104
});
105105

106106
output.Length.ShouldBe(0);
107107
}
108-
108+
109109
[Test]
110110
public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
111111
{

src/GitVersionCore.Tests/DocumentationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.IO;
33
using System.Linq;
44
using System.Reflection;

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
7979
services.AddSingleton(options);
8080
});
8181

82-
82+
8383
var gitVersionCalculator = sp.GetService<IGitVersionCalculator>();
8484

8585
var versionVariables = gitVersionCalculator.CalculateVersionVariables();

src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
194194

195195
var develop = fixture.Repository.FindBranch("develop");
196196
var release = fixture.Repository.FindBranch("release-2.0.0");
197-
197+
198198
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, log, configuration)
199199
.FindMergeBase(release, develop);
200200

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
8787

8888
var serviceProvider = ConfigureService(services =>
8989
{
90-
services.AddSingleton(options);
90+
services.AddSingleton(options);
9191
});
9292

9393
var gitPreparer = serviceProvider.GetService<IGitPreparer>();
@@ -100,7 +100,7 @@ private static IServiceProvider ConfigureService(Action<IServiceCollection> serv
100100
.AddModule(new GitVersionCoreTestModule());
101101

102102
servicesOverrides?.Invoke(services);
103-
return services.BuildServiceProvider();
103+
return services.BuildServiceProvider();
104104
}
105105
}
106106
}

src/GitVersionCore.Tests/GitVersionContextBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public GitVersionContextBuilder WithTaggedMaster()
2828
{
2929
repository = CreateRepository();
3030
var target = repository.Head.Tip;
31-
((MockTagCollection)repository.Tags).Add(new MockTag ("1.0.0", target));
31+
((MockTagCollection)repository.Tags).Add(new MockTag("1.0.0", target));
3232
return this;
3333
}
3434

src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ public static void DeleteDirectory(string directoryPath)
8383
}
8484
}
8585
}
86-
}
86+
}

src/GitVersionCore.Tests/Helpers/PathHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ public static string GetExecutable()
1616
#if NETFRAMEWORK
1717
var executable = Path.Combine(GetExeDirectory(), "GitVersion.exe");
1818
#else
19-
var executable = "dotnet";
19+
var executable = "dotnet";
2020
#endif
2121
return executable;
2222
}
2323

2424
public static string GetExecutableArgs(string args)
2525
{
2626
#if !NETFRAMEWORK
27-
args = $"{Path.Combine(GetExeDirectory(), "GitVersion.dll")} {args}";
27+
args = $"{Path.Combine(GetExeDirectory(), "GitVersion.dll")} {args}";
2828
#endif
2929
return args;
3030
}

src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ namespace GitVersionCore.Tests.Helpers
55
internal class TestableVersionVariables : VersionVariables
66
{
77
public TestableVersionVariables(
8-
string major = "", string minor = "", string patch = "", string buildMetaData = "",
9-
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
10-
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
11-
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
12-
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
8+
string major = "", string minor = "", string patch = "", string buildMetaData = "",
9+
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
10+
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
11+
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
12+
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
1313
string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "",
14-
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
15-
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
14+
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
15+
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
1616
string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
1717
string commitsSinceVersionSourcePadded = "") : base(
18-
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
19-
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
20-
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
21-
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
18+
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
19+
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
20+
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
21+
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
2222
nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
2323
{
2424
}

src/GitVersionCore.Tests/Init/InitScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void CanSetNextVersion()
3232
services.AddSingleton<IConsole>(new TestConsole("3", "2.0.0", "0"));
3333
services.AddSingleton(options);
3434
});
35-
35+
3636
var configurationProvider = sp.GetService<IConfigProvider>();
3737
var fileSystem = sp.GetService<IFileSystem>();
3838
configurationProvider.Init(workingDirectory);

src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public void GitHubFlowMajorRelease()
397397
fixture.MergeNoFF("release/2.0.0");
398398
fixture.SequenceDiagram.Destroy("release/2.0.0");
399399
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
400-
400+
401401
fixture.AssertFullSemver("2.0.0+0");
402402
fixture.ApplyTag("2.0.0");
403403
fixture.AssertFullSemver("2.0.0");

src/GitVersionCore.Tests/IntegrationTests/FileSystemTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.IO;
1+
using System.IO;
22
using System.Text;
33
using NUnit.Framework;
44
using Shouldly;
@@ -62,4 +62,4 @@ public void WhenFileDoesNotExistCreateWithUtf8WithPreamble()
6262
bytes.ShouldBe(preamble);
6363
}
6464
}
65-
}
65+
}

src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Linq;
1+
using System.Linq;
22
using GitTools.Testing;
33
using LibGit2Sharp;
44
using NUnit.Framework;
@@ -83,7 +83,7 @@ public void PatchOlderReleaseExample()
8383
// Merge hotfix branch to support
8484
Commands.Checkout(fixture.Repository, "master");
8585
var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
86-
var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit) tag.Target);
86+
var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit)tag.Target);
8787
Commands.Checkout(fixture.Repository, supportBranch);
8888
fixture.AssertFullSemver("1.1.0");
8989

@@ -228,4 +228,4 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()
228228
}
229229

230230
}
231-
}
231+
}

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ public static void MakeACommit(this RepositoryFixtureBase fixture, string commit
516516
?.GetValue(fixture.SequenceDiagram);
517517

518518
string GetParticipant(string participant) =>
519-
(string) typeof(SequenceDiagram).GetMethod("GetParticipant", BindingFlags.Instance | BindingFlags.NonPublic)
519+
(string)typeof(SequenceDiagram).GetMethod("GetParticipant", BindingFlags.Instance | BindingFlags.NonPublic)
520520
?.Invoke(fixture.SequenceDiagram, new object[]
521521
{
522522
participant

src/GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void CanSpecifyTagPrefixes()
170170
fixture.Repository.MakeCommits(5);
171171

172172
fixture.AssertFullSemver(new Config { TagPrefix = "version-" }, "1.0.4+5");
173-
}
173+
}
174174

175175
[Test]
176176
public void CanSpecifyTagPrefixesAsRegex()

src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void GivenARemoteGitRepositoryAheadOfLocalRepositoryThenChangesShouldPull
5656
fixture.AssertFullSemver("0.1.0+5");
5757
fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository);
5858
var buildSignature = fixture.LocalRepositoryFixture.Repository.Config.BuildSignature(new DateTimeOffset(DateTime.Now));
59-
Commands.Pull((Repository) fixture.LocalRepositoryFixture.Repository, buildSignature, new PullOptions());
59+
Commands.Pull((Repository)fixture.LocalRepositoryFixture.Repository, buildSignature, new PullOptions());
6060
fixture.AssertFullSemver("0.1.0+5", fixture.LocalRepositoryFixture.Repository);
6161
}
6262

src/GitVersionCore.Tests/IntegrationTests/SupportBranchScenarios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GitTools.Testing;
1+
using GitTools.Testing;
22
using GitVersionCore.Tests.Helpers;
33
using LibGit2Sharp;
44
using NUnit.Framework;
@@ -72,4 +72,4 @@ public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed
7272
fixture.AssertFullSemver("1.3.1+2");
7373
}
7474
}
75-
}
75+
}

src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GitTools.Testing;
1+
using GitTools.Testing;
22
using GitVersionCore.Tests.Helpers;
33
using LibGit2Sharp;
44
using NUnit.Framework;
@@ -19,4 +19,4 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTagsDevelopCanUseReach
1919
fixture.AssertFullSemver("1.1.0-alpha.2");
2020
}
2121
}
22-
}
22+
}

src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using GitTools.Testing;
33
using NUnit.Framework;
44
using GitVersion.Configuration;

src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void Json()
3636
var sp = ConfigureServices();
3737

3838
var variableProvider = sp.GetService<IVariableProvider>();
39-
var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
39+
var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
4040
var json = variables.ToString();
4141
json.ShouldMatchApproved(c => c.SubFolder("Approved"));
4242
}

src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ bool ICollection<Branch>.Remove(Branch item)
5050
public int Count => Branches.Count;
5151
public bool IsReadOnly => false;
5252
}
53-
}
53+
}

src/GitVersionCore.Tests/Mocks/MockCommitLog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ public bool Remove(Commit item)
5353

5454
public bool IsReadOnly => false;
5555
}
56-
}
56+
}

src/GitVersionCore.Tests/Mocks/MockMergeCommit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ public MockMergeCommit(ObjectId id = null) : base(id)
99
ParentsEx.Add(null);
1010
}
1111
}
12-
}
12+
}

src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public IEnumerable<LogEntry> QueryBy(string path)
3535
{
3636
throw new NotImplementedException();
3737
}
38-
38+
3939
public Commit FindMergeBase(Commit first, Commit second)
4040
{
4141
return null;
@@ -51,4 +51,4 @@ public IEnumerable<LogEntry> QueryBy(string path, CommitFilter filter)
5151
throw new NotImplementedException();
5252
}
5353
}
54-
}
54+
}

src/GitVersionCore.Tests/Mocks/MockReferenceCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ public bool Remove(Commit item)
5656

5757
public bool IsReadOnly => false;
5858
}
59-
}
59+
}

src/GitVersionCore.Tests/Mocks/MockReflogCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ public bool Remove(Commit item)
4747

4848
public bool IsReadOnly => false;
4949
}
50-
}
50+
}

src/GitVersionCore.Tests/Mocks/MockTag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ public MockTag(string name, Commit target)
2222

2323
public override TagAnnotation Annotation => AnnotationEx;
2424
}
25-
}
25+
}

src/GitVersionCore.Tests/Mocks/MockTagAnnotation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ public class MockTagAnnotation : TagAnnotation
1111
public GitObject TargetEx;
1212
public override GitObject Target => TargetEx;
1313
}
14-
}
14+
}

src/GitVersionCore.Tests/Mocks/MockTagCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ bool ICollection<Tag>.Remove(Tag item)
5656
public int Count => Tags.Count;
5757
public bool IsReadOnly => false;
5858
}
59-
}
59+
}

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void ShouldNotTakeVersionFromUnrelatedMerge(string commitMessage)
140140
var parents = GetParents(true);
141141

142142
AssertMergeMessage(commitMessage, null, parents);
143-
}
143+
}
144144

145145
[TestCase("Merge branch 'support/0.2.0'", "support", "0.2.0")]
146146
[TestCase("Merge branch 'support/0.2.0'", null, null)]

0 commit comments

Comments
 (0)