fix version and help, register in DI GitVersionContext Lazy

Author: arturcic

src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -42,7 +42,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             var variableProvider = sp.GetService<IVariableProvider>();
             var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
-            var contextOptions = sp.GetService<IOptions<GitVersionContext>>();
+            var contextOptions = sp.GetService<Lazy<GitVersionContext>>();
 
             var context = contextOptions.Value;
 

src/GitVersionCore.Tests/Model/GitVersionContextTests.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion;
@@ -8,7 +9,6 @@
 using GitVersionCore.Tests.Mocks;
 using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Shouldly;
 
@@ -175,7 +175,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
         private static GitVersionContext GetGitVersionContext(IRepository repository, string branch, Config config = null)
         {
             var sp = BuildServiceProvider(repository, branch, config);
-            return sp.GetService<IOptions<GitVersionContext>>().Value;
+            return sp.GetService<Lazy<GitVersionContext>>().Value;
         }
     }
 }

src/GitVersionCore/Core/GitRepository.cs

@@ -23,7 +23,10 @@ private static IRepository InitRepository(IOptions<Arguments> options, IGitPrepa
 
         public void Dispose()
         {
-            repositoryInstance.Dispose();
+            if (repositoryLazy.IsValueCreated)
+            {
+                repositoryInstance.Dispose();
+            }
         }
 
         public void Checkout(Tree tree, IEnumerable<string> paths, CheckoutOptions opts)

src/GitVersionCore/Core/GitVersionTool.cs

@@ -25,14 +25,15 @@ public class GitVersionTool : IGitVersionTool
         private readonly IAssemblyInfoFileUpdater assemblyInfoFileUpdater;
 
         private readonly IOptions<Arguments> options;
-        private readonly GitVersionContext context;
+        private readonly Lazy<GitVersionContext> versionContext;
+        private GitVersionContext context => versionContext.Value;
 
         private readonly IBuildServer buildServer;
 
         public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider, IConsole console,
             IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
             IWixVersionFileUpdater wixVersionFileUpdater, IGitVersionInformationGenerator gitVersionInformationGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
-            IOptions<Arguments> options, IOptions<GitVersionContext> versionContext)
+            IOptions<Arguments> options, Lazy<GitVersionContext> versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.console = console ?? throw new ArgumentNullException(nameof(console));
@@ -48,8 +49,8 @@ public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IV
             this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
 
             this.options = options ?? throw new ArgumentNullException(nameof(options));
+            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
 
-            context = versionContext.Value;
             buildServer = buildServerResolver.Resolve();
         }
 

src/GitVersionCore/GitVersionCoreModule.cs

@@ -1,3 +1,4 @@
+using System;
 using GitVersion.BuildServers;
 using GitVersion.Common;
 using GitVersion.Configuration;
@@ -53,7 +54,7 @@ public void RegisterTypes(IServiceCollection services)
             {
                 var options = sp.GetService<IOptions<Arguments>>();
                 var contextFactory = sp.GetService<IGitVersionContextFactory>();
-                return Options.Create(contextFactory.Create(options.Value));
+                return new Lazy<GitVersionContext>(() => contextFactory.Create(options.Value));
             });
 
             services.AddModule(new BuildServerModule());

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -4,23 +4,23 @@
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Logging;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
     public class BaseVersionCalculator : IBaseVersionCalculator
     {
         private readonly ILog log;
         private readonly IRepositoryMetadataProvider repositoryMetadataProvider;
-        private readonly GitVersionContext context;
         private readonly IVersionStrategy[] strategies;
+        private readonly Lazy<GitVersionContext> versionContext;
+        private GitVersionContext context => versionContext.Value;
 
-        public BaseVersionCalculator(ILog log, IRepositoryMetadataProvider repository, IOptions<GitVersionContext> versionContext, IEnumerable<IVersionStrategy> strategies)
+        public BaseVersionCalculator(ILog log, IRepositoryMetadataProvider repository, Lazy<GitVersionContext> versionContext, IEnumerable<IVersionStrategy> strategies)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.repositoryMetadataProvider = repository ?? throw new ArgumentNullException(nameof(repository));
             this.strategies = strategies?.ToArray() ?? Array.Empty<IVersionStrategy>();
-            context = versionContext.Value;
+            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
         }
 
         public BaseVersion GetBaseVersion()

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs

@@ -1,5 +1,5 @@
+using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -10,7 +10,7 @@ namespace GitVersion.VersionCalculation
     /// </summary>
     public class ConfigNextVersionVersionStrategy : VersionStrategyBase
     {
-        public ConfigNextVersionVersionStrategy(IOptions<GitVersionContext> versionContext) : base(versionContext)
+        public ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionContext) : base(versionContext)
         {
         }
 

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs

@@ -1,7 +1,7 @@
+using System;
 using System.Collections.Generic;
 using GitVersion.Common;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -14,7 +14,7 @@ public class FallbackVersionStrategy : VersionStrategyBase
     {
         private readonly IRepositoryMetadataProvider repositoryMetadataProvider;
 
-        public FallbackVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, IOptions<GitVersionContext> versionContext) : base(versionContext)
+        public FallbackVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, Lazy<GitVersionContext> versionContext) : base(versionContext)
         {
             this.repositoryMetadataProvider = repositoryMetadataProvider;
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs

@@ -6,7 +6,6 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -19,7 +18,7 @@ public class MergeMessageVersionStrategy : VersionStrategyBase
     {
         private readonly ILog log;
 
-        public MergeMessageVersionStrategy(ILog log, IOptions<GitVersionContext> versionContext) : base(versionContext)
+        public MergeMessageVersionStrategy(ILog log, Lazy<GitVersionContext> versionContext) : base(versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -4,7 +4,6 @@
 using GitVersion.Common;
 using GitVersion.Extensions;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -17,7 +16,7 @@ public class TaggedCommitVersionStrategy : VersionStrategyBase
     {
         private readonly IRepositoryMetadataProvider repositoryMetadataProvider;
 
-        public TaggedCommitVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, IOptions<GitVersionContext> versionContext) : base(versionContext)
+        public TaggedCommitVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, Lazy<GitVersionContext> versionContext) : base(versionContext)
         {
             this.repositoryMetadataProvider = repositoryMetadataProvider ?? throw new ArgumentNullException(nameof(repositoryMetadataProvider));
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs

@@ -4,7 +4,6 @@
 using GitVersion.Common;
 using GitVersion.Configuration;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -30,7 +29,7 @@ public class TrackReleaseBranchesVersionStrategy : VersionStrategyBase
         private readonly VersionInBranchNameVersionStrategy releaseVersionStrategy;
         private readonly TaggedCommitVersionStrategy taggedCommitVersionStrategy;
 
-        public TrackReleaseBranchesVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, IOptions<GitVersionContext> versionContext)
+        public TrackReleaseBranchesVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, Lazy<GitVersionContext> versionContext)
             : base(versionContext)
         {
             this.repositoryMetadataProvider = repositoryMetadataProvider ?? throw new ArgumentNullException(nameof(repositoryMetadataProvider));

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs

@@ -4,7 +4,6 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -17,7 +16,7 @@ public class VersionInBranchNameVersionStrategy : VersionStrategyBase
     {
         private IRepositoryMetadataProvider repositoryMetadataProvider;
 
-        public VersionInBranchNameVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, IOptions<GitVersionContext> versionContext) : base(versionContext)
+        public VersionInBranchNameVersionStrategy(IRepositoryMetadataProvider repositoryMetadataProvider, Lazy<GitVersionContext> versionContext) : base(versionContext)
         {
             this.repositoryMetadataProvider = repositoryMetadataProvider ?? throw new ArgumentNullException(nameof(repositoryMetadataProvider));
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs

@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
     public class VersionStrategyBase : IVersionStrategy
     {
-        protected readonly GitVersionContext Context;
+        private readonly Lazy<GitVersionContext> versionContext;
+        protected GitVersionContext Context => versionContext.Value;
 
-        protected VersionStrategyBase(IOptions<GitVersionContext> versionContext)
+        protected VersionStrategyBase(Lazy<GitVersionContext> versionContext)
         {
-            Context = versionContext.Value;
+            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
         }
         public virtual IEnumerable<BaseVersion> GetVersions()
         {

src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs

@@ -6,21 +6,21 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using LibGit2Sharp;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
     internal class MainlineVersionCalculator : IMainlineVersionCalculator
     {
         private readonly ILog log;
         private readonly IRepositoryMetadataProvider repositoryMetadataProvider;
-        private readonly GitVersionContext context;
+        private readonly Lazy<GitVersionContext> versionContext;
+        private GitVersionContext context => versionContext.Value;
 
-        public MainlineVersionCalculator(ILog log, IRepositoryMetadataProvider repositoryMetadataProvider, IOptions<GitVersionContext> versionContext)
+        public MainlineVersionCalculator(ILog log, IRepositoryMetadataProvider repositoryMetadataProvider, Lazy<GitVersionContext> versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.repositoryMetadataProvider = repositoryMetadataProvider ?? throw new ArgumentNullException(nameof(repositoryMetadataProvider));
-            context = versionContext.Value;
+            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
         }
 
         public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -4,7 +4,6 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Logging;
-using Microsoft.Extensions.Options;
 
 namespace GitVersion.VersionCalculation
 {
@@ -14,18 +13,18 @@ public class NextVersionCalculator : INextVersionCalculator
         private readonly IBaseVersionCalculator baseVersionCalculator;
         private readonly IMainlineVersionCalculator mainlineVersionCalculator;
         private readonly IRepositoryMetadataProvider repositoryMetadataProvider;
-        private readonly GitVersionContext context;
+        private readonly Lazy<GitVersionContext> versionContext;
+        private GitVersionContext context => versionContext.Value;
 
         public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator,
             IMainlineVersionCalculator mainlineVersionCalculator, IRepositoryMetadataProvider repositoryMetadataProvider,
-            IOptions<GitVersionContext> versionContext)
+            Lazy<GitVersionContext> versionContext)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.baseVersionCalculator = baseVersionCalculator ?? throw new ArgumentNullException(nameof(baseVersionCalculator));
             this.mainlineVersionCalculator = mainlineVersionCalculator ?? throw new ArgumentNullException(nameof(mainlineVersionCalculator));
             this.repositoryMetadataProvider = repositoryMetadataProvider ?? throw new ArgumentNullException(nameof(repositoryMetadataProvider));
-
-            context = versionContext.Value;
+            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
         }
 
         public SemanticVersion FindVersion()
@@ -102,8 +101,6 @@ private SemanticVersion PerformIncrement(BaseVersion baseVersion)
             return semver;
         }
 
-
-
         private void UpdatePreReleaseTag(SemanticVersion semanticVersion, string branchNameOverride)
         {
             var tagToUse = context.Configuration.GetBranchSpecificTag(log, context.CurrentBranch.FriendlyName, branchNameOverride);