Skip to content

Commit 3a2db67

Browse files
JakeGinnivanJakeGinnivan
committed
Updated to latest versions of GitTools.Core and GitTools.Testing
1 parent 85b3c5f commit 3a2db67

27 files changed

+74
-282
lines changed

‎src/GitVersionCore.Tests/ExecuteCoreTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Text;
3-
3+
using GitTools.Testing;
44
using GitVersion;
55
using GitVersion.Helpers;
66

@@ -78,7 +78,7 @@ string RepositoryScope(ExecuteCore executeCore = null, Action<EmptyRepositoryFix
7878

7979
Logger.SetLoggers(infoLogger, s => { }, s => { });
8080

81-
using (var fixture = new EmptyRepositoryFixture(new Config()))
81+
using (var fixture = new EmptyRepositoryFixture())
8282
{
8383
fixture.Repository.MakeACommit();
8484
var vv = executeCore.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null);

‎src/GitVersionCore.Tests/GitPreparerTests.cs

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

‎src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public static Config ApplyDefaults(this Config config)
1616

1717
public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true)
1818
{
19+
ConfigurationProvider.ApplyDefaultsTo(configuration);
1920
var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, configuration, isForTrackedBranchOnly, commitId);
2021
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
2122
var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
@@ -31,7 +32,6 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
3132
}
3233
}
3334

34-
3535
public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true)
3636
{
3737
fixture.AssertFullSemver(new Config(), fullSemver, repository, commitId, isForTrackedBranchOnly);
@@ -64,13 +64,12 @@ static SemanticVersion ExecuteGitVersion(GitVersionContext context)
6464
return vf.FindVersion(context);
6565
}
6666

67-
6867
/// <summary>
6968
/// Simulates running on build server
7069
/// </summary>
7170
public static void InitialiseRepo(this RemoteRepositoryFixture fixture)
7271
{
73-
new GitPreparer(null, null, new Authentication(), false, fixture.LocalRepositoryFixture.RepositoryPath).Initialise(true, null);
72+
// TODO !!new GitPreparer(null, null, new Authentication(), false, fixture.LocalRepositoryFixture.RepositoryPath).Initialise(true, null);
7473
}
7574
}
7675
}

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="GitTools.Core, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\GitTools.Core.0.4.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
55+
<HintPath>..\packages\GitTools.Core.0.4.0-beta0004\lib\net45\GitTools.Core.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="GitTools.Testing, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\GitTools.Testing.0.2.0-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
59+
<HintPath>..\packages\GitTools.Testing.0.2.0-beta0002\lib\net4\GitTools.Testing.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -134,7 +134,6 @@
134134
<Compile Include="GitToolsTestingExtensions.cs" />
135135
<Compile Include="DocumentationTests.cs" />
136136
<Compile Include="ConfigProviderTests.cs" />
137-
<Compile Include="GitPreparerTests.cs" />
138137
<Compile Include="GitVersionContextTests.cs" />
139138
<Compile Include="Helpers\DirectoryHelper.cs" />
140139
<Compile Include="Init\InitScenarios.cs" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public void GitHubFlowMajorRelease()
394394
fixture.AssertFullSemver("2.0.0-beta.1");
395395

396396
// test that the CommitsSinceVersionSource should still return commit count
397-
var version = fixture.GetVersion();
397+
var version = fixture.GetVersion(new Config());
398398
version.CommitsSinceVersionSource.ShouldBe("2");
399399

400400
// Make a commit after a tag should bump up the beta

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public void CanHandleContinuousDelivery()
2222
}
2323
}
2424
};
25-
using(var fixture = new EmptyRepositoryFixture(config))
25+
using(var fixture = new EmptyRepositoryFixture())
2626
{
2727
fixture.Repository.MakeATaggedCommit("1.0.0");
2828
fixture.Repository.MakeCommits(2);
29-
fixture.AssertFullSemver("1.0.1+2");
29+
fixture.AssertFullSemver(config, "1.0.1+2");
3030
}
3131
}
3232

@@ -45,11 +45,11 @@ public void CanHandleContinuousDeployment()
4545
}
4646
}
4747
};
48-
using(var fixture = new EmptyRepositoryFixture(config))
48+
using(var fixture = new EmptyRepositoryFixture())
4949
{
5050
fixture.Repository.MakeATaggedCommit("1.0.0");
5151
fixture.Repository.MakeCommits(2);
52-
fixture.AssertFullSemver("1.0.1-ci.2");
52+
fixture.AssertFullSemver(config, "1.0.1-ci.2");
5353
}
5454
}
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void CanTakeVersionFromReleaseBranch()
2323
[Test]
2424
public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
2525
{
26-
using (var fixture = new EmptyRepositoryFixture(new Config()))
26+
using (var fixture = new EmptyRepositoryFixture())
2727
{
2828
const string TaggedVersion = "1.0.3";
2929
fixture.Repository.MakeATaggedCommit(TaggedVersion);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class OtherScenarios
1111
// This is an attempt to automatically resolve the issue where you cannot build
1212
// when multiple branches point at the same commit
1313
// Current implementation favors master, then branches without - or / in their name
14-
1514
[Test]
1615
public void DoNotBlowUpWhenMasterAndDevelopPointAtSameCommit()
1716
{
@@ -33,7 +32,7 @@ public void DoNotBlowUpWhenMasterAndDevelopPointAtSameCommit()
3332
[Test]
3433
public void AllowNotHavingMaster()
3534
{
36-
using (var fixture = new EmptyRepositoryFixture(new Config()))
35+
using (var fixture = new EmptyRepositoryFixture())
3736
{
3837
fixture.Repository.MakeACommit();
3938
fixture.Repository.MakeATaggedCommit("1.0.0");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void GivenARemoteGitRepositoryWithCommitsAndBranches_ThenClonedLocalShoul
4141
return repo;
4242
}))
4343
{
44-
GitRepository.NormalizeGitDirectory(fixture.LocalRepositoryFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
44+
GitRepositoryHelper.NormalizeGitDirectory(fixture.LocalRepositoryFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
4545

4646
fixture.AssertFullSemver("1.0.0-beta.1+5");
4747
fixture.AssertFullSemver("1.0.0-beta.1+5", fixture.LocalRepositoryFixture.Repository);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void AppliedPrereleaseTagCausesBump()
2929
[Test]
3030
public void CanUseCommitMessagesToBumpVersion()
3131
{
32-
using (var fixture = new EmptyRepositoryFixture(new Config()))
32+
using (var fixture = new EmptyRepositoryFixture())
3333
{
3434
fixture.Repository.MakeACommit();
3535
fixture.MakeATaggedCommit("1.0.0");

‎src/GitVersionCore.Tests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
55
<package id="FluentDateTime" version="1.12.0" targetFramework="net45" />
66
<package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
7-
<package id="GitTools.Testing" version="0.2.0-beta0001" targetFramework="net45" />
8-
<package id="GitTools.Core" version="0.4.0-beta0001" targetFramework="net45" />
9-
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
7+
<package id="GitTools.Core" version="0.4.0-beta0004" targetFramework="net45" />
8+
<package id="GitTools.Testing" version="0.2.0-beta0002" targetFramework="net45" />
109
<package id="LibGit2Sharp" version="0.22.0-pre20150716071016" targetFramework="net45" />
1110
<package id="LibGit2Sharp.NativeBinaries" version="1.0.72" targetFramework="net45" />
11+
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
1212
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
1313
<package id="NSubstitute" version="1.9.2.0" targetFramework="net45" />
1414
<package id="NUnit" version="2.6.4" targetFramework="net45" />

0 commit comments

Comments
 (0)