Skip to content

Commit 5330173

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #601 from JakeGinnivan/RemoveBuildWarnings
Removed build warnings after LibGit2Sharp update
2 parents c2647e7 + 0f506bf commit 5330173

13 files changed

+54
-57
lines changed

‎src/GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void SetupRepo(Action<IRepository> initialMasterAction)
3636

3737
initialMasterAction(Repository);
3838

39-
Repository.CreateBranch("develop").Checkout();
39+
Repository.Checkout(Repository.CreateBranch("develop"));
4040
Repository.MakeACommit();
4141
}
4242
}

‎src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void BranchTo(string branchName, string @as = null)
9595

9696
var branch = Repository.Head.Name;
9797
diagramBuilder.AppendLineFormat("{0} -> {1}: branch from {2}", GetParticipant(branch), GetParticipant(branchName), branch);
98-
Repository.CreateBranch(branchName).Checkout();
98+
Repository.Checkout(Repository.CreateBranch(branchName));
9999
}
100100

101101
public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as = null)
@@ -107,7 +107,7 @@ public void BranchToFromTag(string branchName, string fromTag, string onBranch,
107107
}
108108

109109
diagramBuilder.AppendLineFormat("{0} -> {1}: branch from tag ({2})", GetParticipant(onBranch), GetParticipant(branchName), fromTag);
110-
Repository.CreateBranch(branchName).Checkout();
110+
Repository.Checkout(Repository.CreateBranch(branchName));
111111
}
112112

113113
public void MakeACommit()

‎src/GitVersionCore.Tests/GitVersionContextTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
7676
using (var repo = new EmptyRepositoryFixture(config))
7777
{
7878
repo.Repository.MakeACommit();
79-
repo.Repository.CreateBranch("develop").Checkout();
79+
repo.Repository.Checkout(repo.Repository.CreateBranch("develop"));
8080
repo.Repository.MakeACommit();
8181
var featureBranch = repo.Repository.CreateBranch("feature/foo");
82-
featureBranch.Checkout();
82+
repo.Repository.Checkout(featureBranch);
8383
repo.Repository.MakeACommit();
8484

8585
var context = new GitVersionContext(repo.Repository, config);

‎src/GitVersionCore.Tests/Helpers/GitTestExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static Commit CreatePullRequestRef(this IRepository repository, string fr
7777
if (normalise)
7878
{
7979
// Turn the ref into a real branch
80-
repository.Branches.Add("pull/" + prNumber + "/merge", commit).Checkout();
80+
repository.Checkout(repository.Branches.Add("pull/" + prNumber + "/merge", commit));
8181
}
8282

8383
return commit;

‎src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
1111
using (var fixture = new EmptyRepositoryFixture(new Config()))
1212
{
1313
fixture.Repository.MakeATaggedCommit("1.0.0");
14-
fixture.Repository.CreateBranch("develop").Checkout();
14+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
1515

1616
fixture.Repository.MakeACommit();
1717
fixture.Repository.MakeACommit();
@@ -29,7 +29,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
2929
using (var fixture = new EmptyRepositoryFixture(new Config()))
3030
{
3131
fixture.Repository.MakeATaggedCommit("1.0.0");
32-
fixture.Repository.CreateBranch("develop").Checkout();
32+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
3333

3434
fixture.Repository.MakeACommit();
3535
fixture.Repository.MakeACommit();
@@ -47,7 +47,7 @@ public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
4747
using (var fixture = new EmptyRepositoryFixture(new Config()))
4848
{
4949
fixture.Repository.MakeATaggedCommit("1.0.0");
50-
fixture.Repository.CreateBranch("develop").Checkout();
50+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
5151
fixture.AssertFullSemver("1.0.0");
5252
}
5353
}
@@ -59,13 +59,17 @@ public void CanChangeDevelopTagViaConfig()
5959
{
6060
Branches =
6161
{
62-
{ "develop", new BranchConfig { Tag = "alpha" } }
62+
{"develop", new BranchConfig
63+
{
64+
Tag = "alpha"
65+
}
66+
}
6367
}
6468
};
6569
using (var fixture = new EmptyRepositoryFixture(config))
6670
{
6771
fixture.Repository.MakeATaggedCommit("1.0.0");
68-
fixture.Repository.CreateBranch("develop").Checkout();
72+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
6973
fixture.Repository.MakeACommit();
7074
fixture.AssertFullSemver("1.1.0-alpha.1");
7175
}
@@ -77,7 +81,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
7781
using (var fixture = new EmptyRepositoryFixture(new Config()))
7882
{
7983
fixture.Repository.MakeATaggedCommit("1.0.0");
80-
fixture.Repository.CreateBranch("develop").Checkout();
84+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
8185
fixture.Repository.MakeACommit();
8286
fixture.AssertFullSemver("1.1.0-unstable.1");
8387
}
@@ -89,9 +93,9 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
8993
using (var fixture = new EmptyRepositoryFixture(new Config()))
9094
{
9195
fixture.Repository.MakeATaggedCommit("1.0.0");
92-
fixture.Repository.CreateBranch("develop").Checkout();
96+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
9397
fixture.Repository.MakeACommit();
94-
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
98+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
9599
fixture.Repository.MakeACommit();
96100
fixture.Repository.Checkout("master");
97101
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
@@ -109,13 +113,17 @@ public void CanHandleContinuousDelivery()
109113
{
110114
Branches =
111115
{
112-
{ "develop", new BranchConfig { VersioningMode = VersioningMode.ContinuousDelivery} }
116+
{"develop", new BranchConfig
117+
{
118+
VersioningMode = VersioningMode.ContinuousDelivery
119+
}
120+
}
113121
}
114122
};
115123
using (var fixture = new EmptyRepositoryFixture(config))
116124
{
117125
fixture.Repository.MakeATaggedCommit("1.0.0");
118-
fixture.Repository.CreateBranch("develop").Checkout();
126+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
119127
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
120128
fixture.AssertFullSemver("1.1.0-alpha.7");
121129
}
@@ -127,7 +135,7 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
127135
using (var fixture = new EmptyRepositoryFixture(new Config()))
128136
{
129137
fixture.Repository.MakeATaggedCommit("1.0.0");
130-
fixture.Repository.CreateBranch("develop").Checkout();
138+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
131139
fixture.Repository.MakeACommit();
132140
var commit = fixture.Repository.Head.Tip;
133141
fixture.Repository.MakeACommit();

‎src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void PatchLatestReleaseExample()
1313
{
1414
// create hotfix
1515
fixture.Repository.Checkout("master");
16-
fixture.Repository.CreateBranch("hotfix-1.2.1").Checkout();
16+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix-1.2.1"));
1717
fixture.Repository.MakeACommit();
1818

1919
fixture.AssertFullSemver("1.2.1-beta.1+1");
@@ -54,11 +54,11 @@ public void PatchOlderReleaseExample()
5454
{
5555
// Merge hotfix branch to support
5656
fixture.Repository.Checkout("master");
57-
fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target).Checkout();
57+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("support-1.1", (Commit) fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target));
5858
fixture.AssertFullSemver("1.1.0");
5959

6060
// create hotfix branch
61-
fixture.Repository.CreateBranch("hotfix-1.1.1").Checkout();
61+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix-1.1.1"));
6262
fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
6363
fixture.Repository.MakeACommit();
6464

@@ -67,7 +67,7 @@ public void PatchOlderReleaseExample()
6767
fixture.AssertFullSemver("1.1.1-beta.1+2");
6868

6969
// Create feature branch off hotfix branch and complete
70-
fixture.Repository.CreateBranch("feature/fix").Checkout();
70+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/fix"));
7171
fixture.AssertFullSemver("1.1.1-fix.1+2");
7272
fixture.Repository.MakeACommit();
7373
fixture.AssertFullSemver("1.1.1-fix.1+3");

‎src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
3636
using (var fixture = new RemoteRepositoryFixture(new Config()))
3737
{
3838
fixture.Repository.MakeACommit();
39-
fixture.Repository.CreateBranch("develop").Checkout();
39+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
4040
fixture.Repository.MakeACommit();
4141
fixture.Repository.MakeATaggedCommit("1.0.0");
4242
fixture.Repository.MakeACommit();

‎src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public void CanCalculatePullRequestChanges()
1111
using (var fixture = new EmptyRepositoryFixture(new Config()))
1212
{
1313
fixture.Repository.MakeATaggedCommit("0.1.0");
14-
fixture.Repository.CreateBranch("feature/Foo").Checkout();
14+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
1515
fixture.Repository.MakeACommit();
16-
16+
1717
fixture.Repository.CreatePullRequestRef("feature/Foo", "master", normalise: true);
1818

1919
fixture.Repository.DumpGraph();
@@ -27,9 +27,9 @@ public void CanCalculatePullRequestChangesInheritingConfig()
2727
using (var fixture = new EmptyRepositoryFixture(new Config()))
2828
{
2929
fixture.Repository.MakeATaggedCommit("0.1.0");
30-
fixture.Repository.CreateBranch("develop").Checkout();
30+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
3131
fixture.Repository.MakeACommit();
32-
fixture.Repository.CreateBranch("feature/Foo").Checkout();
32+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
3333
fixture.Repository.MakeACommit();
3434

3535
fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", 44, normalise: true);
@@ -45,7 +45,7 @@ public void CanCalculatePullRequestChangesFromRemoteRepo()
4545
using (var fixture = new EmptyRepositoryFixture(new Config()))
4646
{
4747
fixture.Repository.MakeATaggedCommit("0.1.0");
48-
fixture.Repository.CreateBranch("feature/Foo").Checkout();
48+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
4949
fixture.Repository.MakeACommit();
5050

5151

@@ -62,9 +62,9 @@ public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo()
6262
using (var fixture = new EmptyRepositoryFixture(new Config()))
6363
{
6464
fixture.Repository.MakeATaggedCommit("0.1.0");
65-
fixture.Repository.CreateBranch("develop").Checkout();
65+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
6666
fixture.Repository.MakeACommit();
67-
fixture.Repository.CreateBranch("feature/Foo").Checkout();
67+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
6868
fixture.Repository.MakeACommit();
6969

7070
fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
@@ -79,10 +79,10 @@ public void CanCalculatePullRequestChangesWhenThereAreMultipleMergeCandidates()
7979
using (var fixture = new EmptyRepositoryFixture(new Config()))
8080
{
8181
fixture.Repository.MakeATaggedCommit("0.1.0");
82-
fixture.Repository.CreateBranch("develop").Checkout();
82+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
8383
fixture.Repository.MakeACommit();
84-
fixture.Repository.CreateBranch("copyOfDevelop").Checkout();
85-
fixture.Repository.CreateBranch("feature/Foo").Checkout();
84+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("copyOfDevelop"));
85+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
8686
fixture.Repository.MakeACommit();
8787

8888
fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
@@ -98,7 +98,7 @@ public void CalculatesCorrectVersionAfterReleaseBranchMergedToMaster()
9898
{
9999
fixture.Repository.MakeATaggedCommit("1.0.0");
100100
fixture.Repository.MakeACommit();
101-
fixture.Repository.CreateBranch("release/2.0.0").Checkout();
101+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release/2.0.0"));
102102
fixture.Repository.MakeACommit();
103103
fixture.Repository.MakeACommit();
104104

‎src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
1111
using (var fixture = new EmptyRepositoryFixture(new Config()))
1212
{
1313
fixture.Repository.MakeACommit();
14-
fixture.Repository.CreateBranch("develop").Checkout();
14+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
1515
fixture.Repository.MakeCommits(3);
1616
var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
17-
releaseBranch.Checkout();
1817
fixture.Repository.Checkout("master");
1918
fixture.Repository.MergeNoFF("release/1.0.0");
2019
fixture.Repository.ApplyTag("1.0.0");
@@ -33,10 +32,10 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
3332
using (var fixture = new EmptyRepositoryFixture(new Config()))
3433
{
3534
fixture.Repository.MakeACommit();
36-
fixture.Repository.CreateBranch("develop").Checkout();
35+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
3736
fixture.Repository.MakeCommits(3);
3837
var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
39-
releaseBranch.Checkout();
38+
fixture.Repository.Checkout(releaseBranch);
4039
fixture.Repository.MakeACommit();
4140

4241
// Merge to master
@@ -75,10 +74,13 @@ public void CanTakeVersionFromReleaseBranch()
7574
[Test]
7675
public void ReleaseBranchWithNextVersionSetInConfig()
7776
{
78-
using (var fixture = new EmptyRepositoryFixture(new Config { NextVersion = "2.0.0"}))
77+
using (var fixture = new EmptyRepositoryFixture(new Config
78+
{
79+
NextVersion = "2.0.0"
80+
}))
7981
{
8082
fixture.Repository.MakeCommits(5);
81-
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
83+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
8284

8385
fixture.AssertFullSemver("2.0.0-beta.1+0");
8486
fixture.Repository.MakeCommits(2);

‎src/GitVersionCore.Tests/IntegrationTests/SupportBranchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void SupportIsCalculatedCorrectly()
1515
fixture.Repository.ApplyTag("1.1.0");
1616

1717
// Create 2.0.0 release
18-
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
18+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
1919
fixture.Repository.MakeCommits(2);
2020

2121
// Merge into develop and master
@@ -26,11 +26,11 @@ public void SupportIsCalculatedCorrectly()
2626

2727
// Now lets support 1.x release
2828
fixture.Repository.Checkout("1.1.0");
29-
fixture.Repository.CreateBranch("support/1.0.0").Checkout();
29+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("support/1.0.0"));
3030
fixture.AssertFullSemver("1.1.0");
3131

3232
// Create release branch from support branch
33-
fixture.Repository.CreateBranch("release/1.2.0").Checkout();
33+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release/1.2.0"));
3434
fixture.Repository.MakeACommit();
3535
fixture.AssertFullSemver("1.2.0-beta.1+1");
3636

@@ -41,7 +41,7 @@ public void SupportIsCalculatedCorrectly()
4141
fixture.Repository.ApplyTag("1.2.0");
4242

4343
// Create 1.2.1 hotfix
44-
fixture.Repository.CreateBranch("hotfix/1.2.1").Checkout();
44+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix/1.2.1"));
4545
fixture.Repository.MakeACommit();
4646
fixture.AssertFullSemver("1.2.1-beta.1+1");
4747
fixture.Repository.Checkout("support/1.0.0");

‎src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
1313
fixture.Repository.MakeCommits(5);
1414
fixture.Repository.MakeATaggedCommit("1.0.0.0");
1515
fixture.Repository.MakeCommits(2);
16-
fixture.Repository.CreateBranch("develop").Checkout();
16+
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
1717
fixture.AssertFullSemver("1.1.0-unstable.2");
1818
}
1919
}

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<Compile Include="Mocks\MockBuildEngine.cs" />
128128
<Compile Include="GetVersionTaskTests.cs" />
129129
<Compile Include="Helpers\IPostTestDirectoryRemover.cs" />
130-
<Compile Include="Helpers\LibGit2SharpExtensions.cs" />
131130
<Compile Include="Helpers\Scrubbers.cs" />
132131
<Compile Include="Helpers\SelfCleaningDirectory.cs" />
133132
<Compile Include="Mocks\MockTaskItem.cs" />

‎src/GitVersionTask.Tests/Helpers/LibGit2SharpExtensions.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)