Skip to content

Removed build warnings after LibGit2Sharp update #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2015
Merged

Removed build warnings after LibGit2Sharp update #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void SetupRepo(Action<IRepository> initialMasterAction)

initialMasterAction(Repository);

Repository.CreateBranch("develop").Checkout();
Repository.Checkout(Repository.CreateBranch("develop"));
Repository.MakeACommit();
}
}
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void BranchTo(string branchName, string @as = null)

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

public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as = null)
Expand All @@ -107,7 +107,7 @@ public void BranchToFromTag(string branchName, string fromTag, string onBranch,
}

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

public void MakeACommit()
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/GitVersionContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
using (var repo = new EmptyRepositoryFixture(config))
{
repo.Repository.MakeACommit();
repo.Repository.CreateBranch("develop").Checkout();
repo.Repository.Checkout(repo.Repository.CreateBranch("develop"));
repo.Repository.MakeACommit();
var featureBranch = repo.Repository.CreateBranch("feature/foo");
featureBranch.Checkout();
repo.Repository.Checkout(featureBranch);
repo.Repository.MakeACommit();

var context = new GitVersionContext(repo.Repository, config);
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/Helpers/GitTestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static Commit CreatePullRequestRef(this IRepository repository, string fr
if (normalise)
{
// Turn the ref into a real branch
repository.Branches.Add("pull/" + prNumber + "/merge", commit).Checkout();
repository.Checkout(repository.Branches.Add("pull/" + prNumber + "/merge", commit));
}

return commit;
Expand Down
30 changes: 19 additions & 11 deletions src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));

fixture.Repository.MakeACommit();
fixture.Repository.MakeACommit();
Expand All @@ -29,7 +29,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));

fixture.Repository.MakeACommit();
fixture.Repository.MakeACommit();
Expand All @@ -47,7 +47,7 @@ public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.AssertFullSemver("1.0.0");
}
}
Expand All @@ -59,13 +59,17 @@ public void CanChangeDevelopTagViaConfig()
{
Branches =
{
{ "develop", new BranchConfig { Tag = "alpha" } }
{"develop", new BranchConfig
{
Tag = "alpha"
}
}
}
};
using (var fixture = new EmptyRepositoryFixture(config))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.AssertFullSemver("1.1.0-alpha.1");
}
Expand All @@ -77,7 +81,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.AssertFullSemver("1.1.0-unstable.1");
}
Expand All @@ -89,9 +93,9 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
fixture.Repository.MakeACommit();
fixture.Repository.Checkout("master");
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
Expand All @@ -109,13 +113,17 @@ public void CanHandleContinuousDelivery()
{
Branches =
{
{ "develop", new BranchConfig { VersioningMode = VersioningMode.ContinuousDelivery} }
{"develop", new BranchConfig
{
VersioningMode = VersioningMode.ContinuousDelivery
}
}
}
};
using (var fixture = new EmptyRepositoryFixture(config))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
fixture.AssertFullSemver("1.1.0-alpha.7");
}
Expand All @@ -127,7 +135,7 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
var commit = fixture.Repository.Head.Tip;
fixture.Repository.MakeACommit();
Expand Down
8 changes: 4 additions & 4 deletions src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void PatchLatestReleaseExample()
{
// create hotfix
fixture.Repository.Checkout("master");
fixture.Repository.CreateBranch("hotfix-1.2.1").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix-1.2.1"));
fixture.Repository.MakeACommit();

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

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

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

// Create feature branch off hotfix branch and complete
fixture.Repository.CreateBranch("feature/fix").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/fix"));
fixture.AssertFullSemver("1.1.1-fix.1+2");
fixture.Repository.MakeACommit();
fixture.AssertFullSemver("1.1.1-fix.1+3");
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
using (var fixture = new RemoteRepositoryFixture(new Config()))
{
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.MakeACommit();
Expand Down
22 changes: 11 additions & 11 deletions src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ public void CanCalculatePullRequestChanges()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("0.1.0");
fixture.Repository.CreateBranch("feature/Foo").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
fixture.Repository.MakeACommit();

fixture.Repository.CreatePullRequestRef("feature/Foo", "master", normalise: true);

fixture.Repository.DumpGraph();
Expand All @@ -27,9 +27,9 @@ public void CanCalculatePullRequestChangesInheritingConfig()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("0.1.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("feature/Foo").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
fixture.Repository.MakeACommit();

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


Expand All @@ -62,9 +62,9 @@ public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("0.1.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("feature/Foo").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
fixture.Repository.MakeACommit();

fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
Expand All @@ -79,10 +79,10 @@ public void CanCalculatePullRequestChangesWhenThereAreMultipleMergeCandidates()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeATaggedCommit("0.1.0");
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("copyOfDevelop").Checkout();
fixture.Repository.CreateBranch("feature/Foo").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("copyOfDevelop"));
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/Foo"));
fixture.Repository.MakeACommit();

fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
Expand All @@ -98,7 +98,7 @@ public void CalculatesCorrectVersionAfterReleaseBranchMergedToMaster()
{
fixture.Repository.MakeATaggedCommit("1.0.0");
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("release/2.0.0").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release/2.0.0"));
fixture.Repository.MakeACommit();
fixture.Repository.MakeACommit();

Expand Down
14 changes: 8 additions & 6 deletions src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeCommits(3);
var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
releaseBranch.Checkout();
fixture.Repository.Checkout("master");
fixture.Repository.MergeNoFF("release/1.0.0");
fixture.Repository.ApplyTag("1.0.0");
Expand All @@ -33,10 +32,10 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeACommit();
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.Repository.MakeCommits(3);
var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
releaseBranch.Checkout();
fixture.Repository.Checkout(releaseBranch);
fixture.Repository.MakeACommit();

// Merge to master
Expand Down Expand Up @@ -75,10 +74,13 @@ public void CanTakeVersionFromReleaseBranch()
[Test]
public void ReleaseBranchWithNextVersionSetInConfig()
{
using (var fixture = new EmptyRepositoryFixture(new Config { NextVersion = "2.0.0"}))
using (var fixture = new EmptyRepositoryFixture(new Config
{
NextVersion = "2.0.0"
}))
{
fixture.Repository.MakeCommits(5);
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));

fixture.AssertFullSemver("2.0.0-beta.1+0");
fixture.Repository.MakeCommits(2);
Expand Down
8 changes: 4 additions & 4 deletions src/GitVersionCore.Tests/IntegrationTests/SupportBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public void SupportIsCalculatedCorrectly()
fixture.Repository.ApplyTag("1.1.0");

// Create 2.0.0 release
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("release-2.0.0"));
fixture.Repository.MakeCommits(2);

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

// Now lets support 1.x release
fixture.Repository.Checkout("1.1.0");
fixture.Repository.CreateBranch("support/1.0.0").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("support/1.0.0"));
fixture.AssertFullSemver("1.1.0");

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

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

// Create 1.2.1 hotfix
fixture.Repository.CreateBranch("hotfix/1.2.1").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfix/1.2.1"));
fixture.Repository.MakeACommit();
fixture.AssertFullSemver("1.2.1-beta.1+1");
fixture.Repository.Checkout("support/1.0.0");
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
fixture.Repository.MakeCommits(5);
fixture.Repository.MakeATaggedCommit("1.0.0.0");
fixture.Repository.MakeCommits(2);
fixture.Repository.CreateBranch("develop").Checkout();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
fixture.AssertFullSemver("1.1.0-unstable.2");
}
}
Expand Down
1 change: 0 additions & 1 deletion src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
<Compile Include="Mocks\MockBuildEngine.cs" />
<Compile Include="GetVersionTaskTests.cs" />
<Compile Include="Helpers\IPostTestDirectoryRemover.cs" />
<Compile Include="Helpers\LibGit2SharpExtensions.cs" />
<Compile Include="Helpers\Scrubbers.cs" />
<Compile Include="Helpers\SelfCleaningDirectory.cs" />
<Compile Include="Mocks\MockTaskItem.cs" />
Expand Down
12 changes: 0 additions & 12 deletions src/GitVersionTask.Tests/Helpers/LibGit2SharpExtensions.cs
View file
Open in desktop

This file was deleted.