code cleanup

Author: arturcic

src/GitVersionCore.Tests/Mocks/MockTag.cs

@@ -14,7 +14,7 @@ public class MockTag : Tag
 
         public MockTag() { }
 
-        public MockTag(string name, Commit target)
+        public MockTag(string name, GitObject target)
         {
             NameEx = name;
             TargetEx = target;

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

@@ -154,7 +154,7 @@ public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, strin
             AssertMergeMessage(message, expectedVersion, parents, config);
         }
 
-        private void AssertMergeMessage(string message, string expectedVersion, List<Commit> parents, Config config = null)
+        private void AssertMergeMessage(string message, string expectedVersion, IList<Commit> parents, Config config = null)
         {
             var commit = new MockCommit
             {

src/GitVersionCore/Cache/GitVersionCacheKeyFactory.cs

@@ -6,7 +6,7 @@
 using System.Text;
 using GitVersion.Configuration;
 using GitVersion.Logging;
-using GitVersion.Extensions;
+using LibGit2Sharp;
 
 namespace GitVersion.Cache
 {
@@ -143,17 +143,15 @@ private List<string> CalculateDirectoryContents(string root)
 
         private string GetRepositorySnapshotHash()
         {
-            var repositorySnapshot = gitPreparer.GetDotGitDirectory().WithRepository(repo =>
+            using var repo = new Repository(gitPreparer.GetDotGitDirectory());
+
+            var head = repo.Head;
+            if (head.Tip == null)
             {
-                var head = repo.Head;
-                if (head.Tip == null)
-                {
-                    return head.CanonicalName;
-                }
-                var hash = string.Join(":", head.CanonicalName, head.Tip.Sha);
-                return hash;
-            });
-            return GetHash(repositorySnapshot);
+                return head.CanonicalName;
+            }
+            var hash = string.Join(":", head.CanonicalName, head.Tip.Sha);
+            return GetHash(hash);
         }
 
         private static string GetOverrideConfigHash(Config overrideConfig)

src/GitVersionCore/Extensions/LibGitExtensions.cs

@@ -10,12 +10,6 @@ namespace GitVersion.Extensions
 {
     public static class LibGitExtensions
     {
-        public static TResult WithRepository<TResult>(this string dotGitDirectory, Func<IRepository, TResult> action)
-        {
-            using var repo = new Repository(dotGitDirectory);
-            return action(repo);
-        }
-
         public static DateTimeOffset When(this Commit commit)
         {
             return commit.Committer.When;

src/GitVersionCore/GitVersionCalculator.cs

@@ -4,8 +4,8 @@
 using GitVersion.Cache;
 using GitVersion.Logging;
 using Microsoft.Extensions.Options;
-using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
+using LibGit2Sharp;
 
 namespace GitVersion
 {
@@ -104,13 +104,12 @@ private VersionVariables ExecuteInternal(string targetBranch, string commitId, C
         {
             var configuration = configProvider.Provide(overrideConfig: overrideConfig);
 
-            return gitPreparer.GetDotGitDirectory().WithRepository(repo =>
-            {
-                var gitVersionContext = new GitVersionContext(repo, log, targetBranch, configuration, commitId: commitId);
-                var semanticVersion = nextVersionCalculator.FindVersion(gitVersionContext);
+            using var repo = new Repository(gitPreparer.GetDotGitDirectory());
+
+            var gitVersionContext = new GitVersionContext(repo, log, targetBranch, configuration, commitId: commitId);
+            var semanticVersion = nextVersionCalculator.FindVersion(gitVersionContext);
 
-                return variableProvider.GetVariablesFor(semanticVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
-            });
+            return variableProvider.GetVariablesFor(semanticVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
         }
     }
 }

src/GitVersionCore/Helpers/GitRepositoryHelper.cs

@@ -144,7 +144,7 @@ private static void Fetch(ILog log, AuthenticationInfo authentication, Remote re
             Commands.Fetch(repo, remote.Name, new string[0], authentication.ToFetchOptions(), null);
         }
 
-        private static void EnsureLocalBranchExistsForCurrentBranch(ILog log, Repository repo, Remote remote, string currentBranch)
+        private static void EnsureLocalBranchExistsForCurrentBranch(ILog log, IRepository repo, Remote remote, string currentBranch)
         {
             if (string.IsNullOrEmpty(currentBranch)) return;
 
@@ -180,7 +180,7 @@ private static void EnsureLocalBranchExistsForCurrentBranch(ILog log, Repository
             Commands.Checkout(repo, localCanonicalName);
         }
 
-        private static void AddMissingRefSpecs(ILog log, Repository repo, Remote remote)
+        private static void AddMissingRefSpecs(ILog log, IRepository repo, Remote remote)
         {
             if (remote.FetchRefSpecs.Any(r => r.Source == "refs/heads/*"))
                 return;
@@ -248,7 +248,7 @@ private static void CreateFakeBranchPointingAtThePullRequestTip(ILog log, Reposi
             Commands.Checkout(repo, fakeBranchName);
         }
 
-        private static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, Remote remote, string username, string password)
+        private static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(IRepository repo, Remote remote, string username, string password)
         {
             return repo.Network.ListReferences(remote, (url, fromUrl, types) => new UsernamePasswordCredentials
             {
@@ -257,7 +257,7 @@ private static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCr
             }).Select(r => r.ResolveToDirectReference());
         }
 
-        private static IEnumerable<DirectReference> GetRemoteTipsForAnonymousUser(Repository repo, Remote remote)
+        private static IEnumerable<DirectReference> GetRemoteTipsForAnonymousUser(IRepository repo, Remote remote)
         {
             return repo.Network.ListReferences(remote).Select(r => r.ResolveToDirectReference());
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -36,9 +36,8 @@ public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Bra
                 .SelectMany(commit => { return allTags.Where(t => IsValidTag(t.Item1, commit)); })
                 .Select(t =>
                 {
-                    var commit = t.Item1.PeeledTarget() as Commit;
-                    if (commit != null)
-                        return new VersionTaggedCommit(commit, t.Item2, t.Item1.FriendlyName);
+                    if (t.Item1.PeeledTarget() is Commit)
+                        return new VersionTaggedCommit(t.Item1.PeeledTarget() as Commit, t.Item2, t.Item1.FriendlyName);
 
                     return null;
                 })

src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs

@@ -104,7 +104,7 @@ private static Regex TryGetRegexOrDefault(string messageRegex, Regex defaultRege
             return CompiledRegexCache.GetOrAdd(messageRegex, pattern => new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase));
         }
 
-        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit)
+        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, GitObject baseCommit, Commit headCommit)
         {
             if (baseCommit == null) yield break;
 

src/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs

@@ -12,7 +12,7 @@ public override SemanticVersionPreReleaseTag GetPreReleaseTag(GitVersionContext
             return RetrieveMostRecentOptionalTagVersion(context, possibleCommits) ?? context.Configuration.Tag + ".1";
         }
 
-        private static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVersionContext context, List<Tag> applicableTagsInDescendingOrder)
+        private static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVersionContext context, IReadOnlyCollection<Tag> applicableTagsInDescendingOrder)
         {
             if (applicableTagsInDescendingOrder.Any())
             {

src/GitVersionExe.Tests/HelpWriterTests.cs

@@ -42,7 +42,7 @@ public void AllArgsAreInHelp()
                 .ShouldBeEmpty();
         }
 
-        private static bool IsNotInHelp(Dictionary<string, string> lookup, string propertyName, string helpText)
+        private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
         {
             if (lookup.ContainsKey(propertyName))
                 return !helpText.Contains(lookup[propertyName]);