Skip to content

Commit 2730b3f

Browse files
arturcicarturcic
committed
moved the semanticversion classes to folder, made IGitVersionCache DI
1 parent f6a0c06 commit 2730b3f

File tree

61 files changed

+126
-71
lines changed

Some content is hidden

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

61 files changed

+126
-71
lines changed

‎src/GitVersionCore.Tests/AssemblyFileVersionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using GitVersion;
21
using NUnit.Framework;
32
using Shouldly;
43
using GitVersion.Extensions;
4+
using GitVersion.SemanticVersioning;
55

66
namespace GitVersionCore.Tests
77
{
@@ -26,4 +26,4 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
2626
assemblyFileVersion.ShouldBe(versionString);
2727
}
2828
}
29-
}
29+
}

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using GitVersion;
54
using NSubstitute;
65
using NUnit.Framework;
76
using Shouldly;
@@ -10,6 +9,7 @@
109
using GitVersion.Extensions.VersionAssemblyInfoResources;
1110
using GitVersion.Common;
1211
using GitVersion.Logging;
12+
using GitVersion.SemanticVersioning;
1313

1414
namespace GitVersionCore.Tests
1515
{

‎src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System;
22
using System.Collections.Generic;
3-
using GitVersion;
43
using NUnit.Framework;
54
using Shouldly;
65
using GitVersion.OutputVariables;
76
using GitVersion.Common;
87
using GitVersion.Logging;
8+
using GitVersion.SemanticVersioning;
99

1010
namespace GitVersionCore.Tests.BuildServers
1111
{

‎src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using GitVersion;
65
using NUnit.Framework;
76
using Shouldly;
87
using GitVersion.BuildServers;
98
using GitVersion.Common;
109
using GitVersion.OutputVariables;
1110
using GitVersion.Logging;
11+
using GitVersion.SemanticVersioning;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

‎src/GitVersionCore.Tests/BuildServers/GitLabCiMessageGenerationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using GitVersion;
65
using NUnit.Framework;
76
using Shouldly;
87
using GitVersion.BuildServers;
98
using GitVersion.Common;
109
using GitVersion.Logging;
1110
using GitVersion.OutputVariables;
11+
using GitVersion.SemanticVersioning;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

‎src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using GitVersion;
65
using NUnit.Framework;
76
using Shouldly;
87
using GitVersion.BuildServers;
98
using GitVersion.Common;
109
using GitVersion.Logging;
1110
using GitVersion.OutputVariables;
11+
using GitVersion.SemanticVersioning;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

‎src/GitVersionCore.Tests/CommitDateTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using GitVersion.Configuration;
77
using GitVersion.VersioningModes;
88
using GitVersion.Extensions;
9+
using GitVersion.SemanticVersioning;
910

1011
namespace GitVersionCore.Tests
1112
{

‎src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using GitVersion;
3+
using GitVersion.Cache;
34
using GitVersion.Common;
45
using GitVersion.Configuration;
56
using NUnit.Framework;
@@ -79,8 +80,9 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
7980
var testFileSystem = new TestFileSystem();
8081
var log = new NullLog();
8182
var configFileLocator = new DefaultConfigFileLocator(testFileSystem, log);
82-
83-
var executeCore = new GitVersionComputer(testFileSystem, log, configFileLocator, new BuildServerResolver(null, log));
83+
var gitVersionCache = new GitVersionCache(testFileSystem, log);
84+
var buildServerResolver = new BuildServerResolver(null, log);
85+
var executeCore = new GitVersionComputer(testFileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
8486

8587
var versionVariables = executeCore.ComputeVersionVariables(arguments);
8688

‎src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Shouldly;
88
using GitVersion.Helpers;
99
using GitVersion.Logging;
10+
using GitVersion.SemanticVersioning;
1011

1112
namespace GitVersionCore.Tests
1213
{

‎src/GitVersionCore.Tests/GitVersionExecutorTests.cs

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class GitVersionExecutorTests : TestBase
2626
private ILog log;
2727
private IConfigFileLocator configFileLocator;
2828
private IBuildServerResolver buildServerResolver;
29+
private IGitVersionCache gitVersionCache;
2930

3031
[SetUp]
3132
public void SetUp()
@@ -35,12 +36,13 @@ public void SetUp()
3536
log = new NullLog();
3637
configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
3738
buildServerResolver = new BuildServerResolver(null, log);
39+
gitVersionCache = new GitVersionCache(fileSystem, log);
3840
}
3941

4042
[Test]
4143
public void CacheKeySameAfterReNormalizing()
4244
{
43-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
45+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
4446

4547
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
4648
{
@@ -55,9 +57,9 @@ public void CacheKeySameAfterReNormalizing()
5557
var gitPreparer = new GitPreparer(log, arguments);
5658
configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
5759
gitPreparer.Initialize(true, targetBranch);
58-
var cacheKey1 = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, null, configFileLocator);
60+
var cacheKey1 = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, configFileLocator, null);
5961
gitPreparer.Initialize(true, targetBranch);
60-
var cacheKey2 = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, null, configFileLocator);
62+
var cacheKey2 = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, configFileLocator, null);
6163

6264
cacheKey2.Value.ShouldBe(cacheKey1.Value);
6365
});
@@ -68,7 +70,7 @@ public void CacheKeySameAfterReNormalizing()
6870
[Description("LibGit2Sharp fails here when running under Mono")]
6971
public void CacheKeyForWorktree()
7072
{
71-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
73+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
7274

7375
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
7476
{
@@ -89,7 +91,7 @@ public void CacheKeyForWorktree()
8991

9092
var gitPreparer = new GitPreparer(log, arguments);
9193
configFileLocator = new DefaultConfigFileLocator(fileSystem, log);
92-
var cacheKey = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, null, configFileLocator);
94+
var cacheKey = GitVersionCacheKeyFactory.Create(fileSystem, log, gitPreparer, configFileLocator, null);
9395
cacheKey.Value.ShouldNotBeEmpty();
9496
}
9597
finally
@@ -141,7 +143,8 @@ public void CacheFileExistsOnDisk()
141143
var logAppender = new TestLogAppender(Action);
142144
log = new Log(logAppender);
143145

144-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
146+
gitVersionCache = new GitVersionCache(fileSystem, log);
147+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
145148

146149
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
147150
{
@@ -190,7 +193,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
190193
CommitDate: 2015-11-10
191194
";
192195

193-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
196+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
194197

195198
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
196199
{
@@ -202,7 +205,8 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
202205
};
203206

204207
var gitPreparer = new GitPreparer(log, arguments);
205-
var cacheDirectory = GitVersionCache.GetCacheDirectory(gitPreparer);
208+
var gitVersionCache = new GitVersionCache(fileSystem, log);
209+
var cacheDirectory = gitVersionCache.GetCacheDirectory(gitPreparer);
206210

207211
var cacheDirectoryTimestamp = fileSystem.GetLastDirectoryWrite(cacheDirectory);
208212

@@ -225,8 +229,9 @@ public void CacheFileIsMissing()
225229

226230
var logAppender = new TestLogAppender(Action);
227231
log = new Log(logAppender);
232+
gitVersionCache = new GitVersionCache(fileSystem, log);
228233

229-
var executeCore = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
234+
var executeCore = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
230235

231236
RepositoryScope(executeCore);
232237
var logsMessages = stringBuilder.ToString();
@@ -270,7 +275,7 @@ public void ConfigChangeInvalidatesCache()
270275
CommitDate: 2015-11-10
271276
";
272277

273-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
278+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
274279

275280
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
276281
{
@@ -323,7 +328,7 @@ public void NoCacheBypassesCache()
323328
CommitDate: 2015-11-10
324329
";
325330

326-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
331+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
327332

328333
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
329334
{
@@ -343,7 +348,7 @@ public void NoCacheBypassesCache()
343348
[Test]
344349
public void WorkingDirectoryWithoutGit()
345350
{
346-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
351+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
347352

348353
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
349354
{
@@ -359,7 +364,7 @@ public void WorkingDirectoryWithoutGit()
359364
[Description("LibGit2Sharp fails when running under Mono")]
360365
public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
361366
{
362-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
367+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
363368

364369
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
365370
{
@@ -391,7 +396,7 @@ public void GetProjectRootDirectory_WorkingDirectoryWithWorktree()
391396
[Test]
392397
public void GetProjectRootDirectory_NoWorktree()
393398
{
394-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
399+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
395400

396401
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
397402
{
@@ -412,7 +417,7 @@ public void GetProjectRootDirectory_NoWorktree()
412417
[Test]
413418
public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
414419
{
415-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
420+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
416421

417422
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
418423
{
@@ -430,7 +435,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
430435
[Test]
431436
public void GetDotGitDirectory_NoWorktree()
432437
{
433-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
438+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
434439

435440
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
436441
{
@@ -453,7 +458,7 @@ public void GetDotGitDirectory_NoWorktree()
453458
[Description("LibGit2Sharp fails when running under Mono")]
454459
public void GetDotGitDirectory_Worktree()
455460
{
456-
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver);
461+
var versionAndBranchFinder = new GitVersionComputer(fileSystem, log, configFileLocator, buildServerResolver, gitVersionCache);
457462

458463
RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
459464
{

0 commit comments

Comments
 (0)