Change property FullConfiguration to Configuration in GitVersionContext.

HHobeck · HHobeck · commit 410c92edec76 · 2022-10-11T09:57:46.000+02:00
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
@@ -48,8 +48,8 @@ public void ConfigNextVersionTest(string nextVersion, string expectedVersion)
         var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, ConfigNextVersionVersionStrategy>();
         var context = contextBuilder.ServicesProvider.GetRequiredService<Lazy<GitVersionContext>>().Value;
         var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());
-        var branchConfiguration = context.FullConfiguration.GetBranchConfiguration(branchMock);
-        var effectiveConfiguration = new EffectiveConfiguration(context.FullConfiguration, branchConfiguration);
+        var branchConfiguration = context.Configuration.GetBranchConfiguration(branchMock);
+        var effectiveConfiguration = new EffectiveConfiguration(context.Configuration, branchConfiguration);
         return strategy.GetBaseVersions(new(branchMock, effectiveConfiguration)).SingleOrDefault();
     }
 }
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -39,8 +39,8 @@ public void ShouldNotAllowIncrementOfVersion()
         contextBuilder.ServicesProvider.ShouldNotBeNull();
         var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
         var context = contextBuilder.ServicesProvider.GetRequiredService<Lazy<GitVersionContext>>().Value;
-        var branchConfiguration = context.FullConfiguration.GetBranchConfiguration(mockBranch);
-        var effectiveConfiguration = new EffectiveConfiguration(context.FullConfiguration, branchConfiguration);
+        var branchConfiguration = context.Configuration.GetBranchConfiguration(mockBranch);
+        var effectiveConfiguration = new EffectiveConfiguration(context.Configuration, branchConfiguration);
         var baseVersion = strategy.GetBaseVersions(new(mockBranch, effectiveConfiguration)).Single();
 
         baseVersion.ShouldIncrement.ShouldBe(false);
@@ -172,8 +172,8 @@ private static void AssertMergeMessage(string message, string? expectedVersion,
         contextBuilder.ServicesProvider.ShouldNotBeNull();
         var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
         var context = contextBuilder.ServicesProvider.GetRequiredService<Lazy<GitVersionContext>>().Value;
-        var branchConfiguration = context.FullConfiguration.GetBranchConfiguration(mockBranch);
-        var effectiveConfiguration = new EffectiveConfiguration(context.FullConfiguration, branchConfiguration);
+        var branchConfiguration = context.Configuration.GetBranchConfiguration(mockBranch);
+        var effectiveConfiguration = new EffectiveConfiguration(context.Configuration, branchConfiguration);
         var baseVersion = strategy.GetBaseVersions(new(mockBranch, effectiveConfiguration)).SingleOrDefault();
 
         if (expectedVersion == null)
diff --git a/src/GitVersion.Core/Model/GitVersionContext.cs b/src/GitVersion.Core/Model/GitVersionContext.cs
@@ -11,7 +11,7 @@ public class GitVersionContext
     /// <summary>
     /// Contains the raw configuration, use Configuration for specific config based on the current GitVersion context.
     /// </summary>
-    public Config FullConfiguration { get; }
+    public Config Configuration { get; }
 
     public SemanticVersion? CurrentCommitTaggedVersion { get; }
 
@@ -28,14 +28,14 @@ public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,
     {
         CurrentBranch = currentBranch;
         CurrentCommit = currentCommit;
-        FullConfiguration = configuration;
+        Configuration = configuration;
         CurrentCommitTaggedVersion = currentCommitTaggedVersion;
         NumberOfUncommittedChanges = numberOfUncommittedChanges;
     }
 
     public EffectiveConfiguration GetEffectiveConfiguration(IBranch branch)
     {
-        BranchConfig branchConfiguration = FullConfiguration.GetBranchConfiguration(branch);
-        return new EffectiveConfiguration(FullConfiguration, branchConfiguration);
+        BranchConfig branchConfiguration = Configuration.GetBranchConfiguration(branch);
+        return new EffectiveConfiguration(Configuration, branchConfiguration);
     }
 }
diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt
@@ -322,10 +322,10 @@ GitVersion.GitVersionCalculateTool
 GitVersion.GitVersionCalculateTool.CalculateVersionVariables() -> GitVersion.OutputVariables.VersionVariables!
 GitVersion.GitVersionCalculateTool.GitVersionCalculateTool(GitVersion.Logging.ILog! log, GitVersion.VersionCalculation.INextVersionCalculator! nextVersionCalculator, GitVersion.VersionCalculation.IVariableProvider! variableProvider, GitVersion.IGitPreparer! gitPreparer, GitVersion.VersionCalculation.Cache.IGitVersionCache! gitVersionCache, GitVersion.VersionCalculation.Cache.IGitVersionCacheKeyFactory! cacheKeyFactory, Microsoft.Extensions.Options.IOptions<GitVersion.GitVersionOptions!>! options, System.Lazy<GitVersion.GitVersionContext!>! versionContext) -> void
 GitVersion.GitVersionContext
+GitVersion.GitVersionContext.Configuration.get -> GitVersion.Model.Configuration.Config!
 GitVersion.GitVersionContext.CurrentBranch.get -> GitVersion.IBranch!
 GitVersion.GitVersionContext.CurrentCommit.get -> GitVersion.ICommit?
 GitVersion.GitVersionContext.CurrentCommitTaggedVersion.get -> GitVersion.SemanticVersion?
-GitVersion.GitVersionContext.FullConfiguration.get -> GitVersion.Model.Configuration.Config!
 GitVersion.GitVersionContext.GetEffectiveConfiguration(GitVersion.IBranch! branch) -> GitVersion.Model.Configuration.EffectiveConfiguration!
 GitVersion.GitVersionContext.GitVersionContext(GitVersion.IBranch! currentBranch, GitVersion.ICommit? currentCommit, GitVersion.Model.Configuration.Config! configuration, GitVersion.SemanticVersion? currentCommitTaggedVersion, int numberOfUncommittedChanges) -> void
 GitVersion.GitVersionContext.IsCurrentCommitTagged.get -> bool
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
@@ -16,10 +16,10 @@ public ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionContext)
 
     public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)
     {
-        var nextVersion = Context.FullConfiguration.NextVersion;
+        var nextVersion = Context.Configuration.NextVersion;
         if (!nextVersion.IsNullOrEmpty() && !Context.IsCurrentCommitTagged)
         {
-            var semanticVersion = SemanticVersion.Parse(nextVersion, Context.FullConfiguration.TagPrefix);
+            var semanticVersion = SemanticVersion.Parse(nextVersion, Context.Configuration.TagPrefix);
             yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);
         }
     }
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -35,7 +35,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur
             {
                 if (TryParse(c, Context, out var mergeMessage) &&
                     mergeMessage.Version != null &&
-                    Context.FullConfiguration.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)))
+                    Context.Configuration.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)))
                 {
                     this.log.Info($"Found commit [{Context.CurrentCommit}] matching merge message format: {mergeMessage.FormatName}");
                     var shouldIncrement = !configuration.Value.PreventIncrementOfMergedBranchVersion;
@@ -84,7 +84,7 @@ private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [No
             return null;
         }
 
-        var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
+        var mergeMessage = new MergeMessage(mergeCommit.Message, context.Configuration);
         return mergeMessage;
     }
 
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -23,7 +23,7 @@ internal IEnumerable<BaseVersion> GetTaggedVersions(IBranch currentBranch, DateT
     {
         if (currentBranch is null)
             return Enumerable.Empty<BaseVersion>();
-        var versionTags = this.repositoryStore.GetValidVersionTags(Context.FullConfiguration.TagPrefix, olderThan);
+        var versionTags = this.repositoryStore.GetValidVersionTags(Context.Configuration.TagPrefix, olderThan);
         var versionTagsByCommit = versionTags.ToLookup(vt => vt.Item3.Id.Sha);
         var commitsOnBranch = currentBranch.Commits;
         if (commitsOnBranch == null)
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
@@ -41,7 +41,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur
 
     private IEnumerable<BaseVersion> MainTagsVersions()
     {
-        var configuration = Context.FullConfiguration;
+        var configuration = Context.Configuration;
         var mainBranch = this.repositoryStore.FindMainBranch(configuration);
 
         return mainBranch != null
@@ -51,7 +51,7 @@ private IEnumerable<BaseVersion> MainTagsVersions()
 
     private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()
     {
-        var releaseBranchConfig = Context.FullConfiguration.GetReleaseBranchConfig();
+        var releaseBranchConfig = Context.Configuration.GetReleaseBranchConfig();
         if (!releaseBranchConfig.Any())
             return Array.Empty<BaseVersion>();
 
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -20,12 +20,12 @@ public VersionInBranchNameVersionStrategy(IRepositoryStore repositoryStore, Lazy
     public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)
     {
         string nameWithoutOrigin = NameWithoutOrigin(configuration.Branch);
-        if (Context.FullConfiguration.IsReleaseBranch(nameWithoutOrigin))
+        if (Context.Configuration.IsReleaseBranch(nameWithoutOrigin))
         {
-            var versionInBranch = GetVersionInBranch(configuration.Branch.Name.Friendly, Context.FullConfiguration.TagPrefix);
+            var versionInBranch = GetVersionInBranch(configuration.Branch.Name.Friendly, Context.Configuration.TagPrefix);
             if (versionInBranch != null)
             {
-                var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.FullConfiguration);
+                var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.Configuration);
                 var branchNameOverride = Context.CurrentBranch.Name.Friendly.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
                 yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom.Commit, branchNameOverride);
             }
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -97,7 +97,7 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer
             commits = commits.Where(c => c.Parents.Count() > 1);
         }
 
-        return GetIncrementForCommits(context.FullConfiguration, commits);
+        return GetIncrementForCommits(context.Configuration, commits);
     }
 
     private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex) =>
diff --git a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
@@ -52,7 +52,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
             var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersion.BaseVersionSource, mainlineTip).ToList();
             var directCommits = new List<ICommit>(mainlineCommitLog.Count);
 
-            var nextVersion = context.FullConfiguration.NextVersion;
+            var nextVersion = context.Configuration.NextVersion;
             if (nextVersion.IsNullOrEmpty())
             {
                 // Scans commit log in reverse, aggregating merge commits
@@ -90,7 +90,7 @@ public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVers
         {
             var commitLogs = this.repositoryStore.GetCommitLog(baseVersionSource, context.CurrentCommit);
 
-            var ignore = context.FullConfiguration.Ignore;
+            var ignore = context.Configuration.Ignore;
             if (!ignore.IsEmpty)
             {
                 var shasToIgnore = new HashSet<string>(ignore.ShAs);
@@ -135,7 +135,7 @@ private SemanticVersion AggregateMergeCommitIncrement(ICommit commit, List<IComm
 
     private IBranch GetMainline(ICommit? baseVersionSource)
     {
-        if (context.FullConfiguration.Branches.TryGetValue(context.CurrentBranch.Name.Friendly, out var branchConfig)
+        if (context.Configuration.Branches.TryGetValue(context.CurrentBranch.Name.Friendly, out var branchConfig)
             && branchConfig.IsMainline == true)
         {
             return context.CurrentBranch;
@@ -145,13 +145,13 @@ private IBranch GetMainline(ICommit? baseVersionSource)
 
         if (context.CurrentCommit != null)
         {
-            mainlineBranches = this.repositoryStore.GetMainlineBranches(context.CurrentCommit, context.FullConfiguration);
+            mainlineBranches = this.repositoryStore.GetMainlineBranches(context.CurrentCommit, context.Configuration);
         }
         mainlineBranches ??= new Dictionary<string, List<IBranch>>();
 
         if (!mainlineBranches.Any())
         {
-            var mainlineBranchConfigsString = string.Join(", ", context.FullConfiguration.Branches.Where(b => b.Value?.IsMainline == true).Select(b => b.Value.Name));
+            var mainlineBranchConfigsString = string.Join(", ", context.Configuration.Branches.Where(b => b.Value?.IsMainline == true).Select(b => b.Value.Name));
             throw new WarningException($"No branches can be found matching the commit {context.CurrentCommit?.Sha} in the configured Mainline branches: {mainlineBranchConfigsString}");
         }
 
@@ -277,7 +277,7 @@ private SemanticVersion IncrementForEachCommit(IEnumerable<ICommit> directCommit
     {
         foreach (var directCommit in directCommits)
         {
-            var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(context.FullConfiguration, new[] { directCommit })
+            var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(context.Configuration, new[] { directCommit })
                 ?? FindDefaultIncrementForBranch(context, mainline.Name.Friendly);
             mainlineVersion = mainlineVersion.IncrementVersion(directCommitIncrement);
             this.log.Info($"Direct commit on main {directCommit} incremented base versions {directCommitIncrement}, now {mainlineVersion}");
@@ -290,19 +290,19 @@ private VersionField FindMessageIncrement(ICommit? mergeCommit, ICommit? mergedH
     {
         var commits = this.repositoryStore.GetMergeBaseCommits(mergeCommit, mergedHead, findMergeBase);
         commitLog.RemoveAll(c => commits.Any(c1 => c1.Sha == c.Sha));
-        return this.incrementStrategyFinder.GetIncrementForCommits(context.FullConfiguration, commits)
+        return this.incrementStrategyFinder.GetIncrementForCommits(context.Configuration, commits)
             ?? TryFindIncrementFromMergeMessage(mergeCommit);
     }
 
     private VersionField TryFindIncrementFromMergeMessage(ICommit? mergeCommit)
     {
         if (mergeCommit != null)
         {
-            var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
-            var config = context.FullConfiguration.GetBranchConfiguration(mergeMessage.MergedBranch);
-            if (config.Increment != null && config.Increment != IncrementStrategy.Inherit)
+            var mergeMessage = new MergeMessage(mergeCommit.Message, context.Configuration);
+            var configuration = context.Configuration.GetBranchConfiguration(mergeMessage.MergedBranch);
+            if (configuration.Increment != null && configuration.Increment != IncrementStrategy.Inherit)
             {
-                return config.Increment.Value.ToVersionField();
+                return configuration.Increment.Value.ToVersionField();
             }
         }
 
@@ -312,10 +312,10 @@ private VersionField TryFindIncrementFromMergeMessage(ICommit? mergeCommit)
 
     private static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string? branchName = null)
     {
-        var config = context.FullConfiguration.GetBranchConfiguration(branchName ?? context.CurrentBranch.Name.WithoutRemote);
-        if (config.Increment != null && config.Increment != IncrementStrategy.Inherit)
+        var configuration = context.Configuration.GetBranchConfiguration(branchName ?? context.CurrentBranch.Name.WithoutRemote);
+        if (configuration.Increment != null && configuration.Increment != IncrementStrategy.Inherit)
         {
-            return config.Increment.Value.ToVersionField();
+            return configuration.Increment.Value.ToVersionField();
         }
 
         // TODO: Hardcoded fallback values are not so good. It might be better to get this information either from the fallback or the unknown
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
@@ -65,10 +65,10 @@ public virtual NextVersion FindVersion()
 
         //
 
-        var nextVersion = Calculate(Context.CurrentBranch, Context.FullConfiguration);
+        var nextVersion = Calculate(Context.CurrentBranch, Context.Configuration);
         nextVersion.BaseVersion.SemanticVersion.BuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
         SemanticVersion semver;
-        if (Context.FullConfiguration.VersioningMode == VersioningMode.Mainline)
+        if (Context.Configuration.VersioningMode == VersioningMode.Mainline)
         {
             semver = this.mainlineVersionCalculator.FindMainlineModeVersion(nextVersion.BaseVersion);
         }
@@ -119,7 +119,7 @@ private void UpdatePreReleaseTag(EffectiveBranchConfiguration configuration, Sem
 
         // TODO: Please update the pre release-tag in the IVersionStrategy implementation.
         var lastTag = this.repositoryStore
-            .GetVersionTagsOnBranch(Context.CurrentBranch, Context.FullConfiguration.TagPrefix)
+            .GetVersionTagsOnBranch(Context.CurrentBranch, Context.Configuration.TagPrefix)
             .FirstOrDefault(v => v.PreReleaseTag?.Name?.IsEquivalentTo(tagToUse) == true);
 
         if (lastTag != null && MajorMinorPatchEqual(lastTag, semanticVersion) && lastTag.HasPreReleaseTagWithLabel)

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public void ConfigNextVersionTest(string nextVersion, string expectedVersion)`
`48`	`48`	`var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, ConfigNextVersionVersionStrategy>();`
`49`	`49`	`var context = contextBuilder.ServicesProvider.GetRequiredService<Lazy<GitVersionContext>>().Value;`
`50`	`50`	`var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit());`
`51`		`- var branchConfiguration = context.FullConfiguration.GetBranchConfiguration(branchMock);`
`52`		`- var effectiveConfiguration = new EffectiveConfiguration(context.FullConfiguration, branchConfiguration);`
	`51`	`+ var branchConfiguration = context.Configuration.GetBranchConfiguration(branchMock);`
	`52`	`+ var effectiveConfiguration = new EffectiveConfiguration(context.Configuration, branchConfiguration);`
`53`	`53`	`return strategy.GetBaseVersions(new(branchMock, effectiveConfiguration)).SingleOrDefault();`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class GitVersionContext`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Contains the raw configuration, use Configuration for specific config based on the current GitVersion context.`
`13`	`13`	`/// </summary>`
`14`		`- public Config FullConfiguration { get; }`
	`14`	`+ public Config Configuration { get; }`
`15`	`15`
`16`	`16`	`public SemanticVersion? CurrentCommitTaggedVersion { get; }`
`17`	`17`
`@@ -28,14 +28,14 @@ public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,`
`28`	`28`	`{`
`29`	`29`	`CurrentBranch = currentBranch;`
`30`	`30`	`CurrentCommit = currentCommit;`
`31`		`- FullConfiguration = configuration;`
	`31`	`+ Configuration = configuration;`
`32`	`32`	`CurrentCommitTaggedVersion = currentCommitTaggedVersion;`
`33`	`33`	`NumberOfUncommittedChanges = numberOfUncommittedChanges;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public EffectiveConfiguration GetEffectiveConfiguration(IBranch branch)`
`37`	`37`	`{`
`38`		`- BranchConfig branchConfiguration = FullConfiguration.GetBranchConfiguration(branch);`
`39`		`- return new EffectiveConfiguration(FullConfiguration, branchConfiguration);`
	`38`	`+ BranchConfig branchConfiguration = Configuration.GetBranchConfiguration(branch);`
	`39`	`+ return new EffectiveConfiguration(Configuration, branchConfiguration);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ public ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionContext)`
`16`	`16`
`17`	`17`	`public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)`
`18`	`18`	`{`
`19`		`- var nextVersion = Context.FullConfiguration.NextVersion;`
	`19`	`+ var nextVersion = Context.Configuration.NextVersion;`
`20`	`20`	`if (!nextVersion.IsNullOrEmpty() && !Context.IsCurrentCommitTagged)`
`21`	`21`	`{`
`22`		`- var semanticVersion = SemanticVersion.Parse(nextVersion, Context.FullConfiguration.TagPrefix);`
	`22`	`+ var semanticVersion = SemanticVersion.Parse(nextVersion, Context.Configuration.TagPrefix);`
`23`	`23`	`yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur`
`35`	`35`	`{`
`36`	`36`	`if (TryParse(c, Context, out var mergeMessage) &&`
`37`	`37`	`mergeMessage.Version != null &&`
`38`		`- Context.FullConfiguration.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)))`
	`38`	`+ Context.Configuration.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)))`
`39`	`39`	`{`
`40`	`40`	`this.log.Info($"Found commit [{Context.CurrentCommit}] matching merge message format: {mergeMessage.FormatName}");`
`41`	`41`	`var shouldIncrement = !configuration.Value.PreventIncrementOfMergedBranchVersion;`
`@@ -84,7 +84,7 @@ private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [No`
`84`	`84`	`return null;`
`85`	`85`	`}`
`86`	`86`
`87`		`- var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);`
	`87`	`+ var mergeMessage = new MergeMessage(mergeCommit.Message, context.Configuration);`
`88`	`88`	`return mergeMessage;`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ internal IEnumerable<BaseVersion> GetTaggedVersions(IBranch currentBranch, DateT`
`23`	`23`	`{`
`24`	`24`	`if (currentBranch is null)`
`25`	`25`	`return Enumerable.Empty<BaseVersion>();`
`26`		`- var versionTags = this.repositoryStore.GetValidVersionTags(Context.FullConfiguration.TagPrefix, olderThan);`
	`26`	`+ var versionTags = this.repositoryStore.GetValidVersionTags(Context.Configuration.TagPrefix, olderThan);`
`27`	`27`	`var versionTagsByCommit = versionTags.ToLookup(vt => vt.Item3.Id.Sha);`
`28`	`28`	`var commitsOnBranch = currentBranch.Commits;`
`29`	`29`	`if (commitsOnBranch == null)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur`
`41`	`41`
`42`	`42`	`private IEnumerable<BaseVersion> MainTagsVersions()`
`43`	`43`	`{`
`44`		`- var configuration = Context.FullConfiguration;`
	`44`	`+ var configuration = Context.Configuration;`
`45`	`45`	`var mainBranch = this.repositoryStore.FindMainBranch(configuration);`
`46`	`46`
`47`	`47`	`return mainBranch != null`
`@@ -51,7 +51,7 @@ private IEnumerable<BaseVersion> MainTagsVersions()`
`51`	`51`
`52`	`52`	`private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()`
`53`	`53`	`{`
`54`		`- var releaseBranchConfig = Context.FullConfiguration.GetReleaseBranchConfig();`
	`54`	`+ var releaseBranchConfig = Context.Configuration.GetReleaseBranchConfig();`
`55`	`55`	`if (!releaseBranchConfig.Any())`
`56`	`56`	`return Array.Empty<BaseVersion>();`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public VersionInBranchNameVersionStrategy(IRepositoryStore repositoryStore, Lazy`
`20`	`20`	`public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)`
`21`	`21`	`{`
`22`	`22`	`string nameWithoutOrigin = NameWithoutOrigin(configuration.Branch);`
`23`		`- if (Context.FullConfiguration.IsReleaseBranch(nameWithoutOrigin))`
	`23`	`+ if (Context.Configuration.IsReleaseBranch(nameWithoutOrigin))`
`24`	`24`	`{`
`25`		`- var versionInBranch = GetVersionInBranch(configuration.Branch.Name.Friendly, Context.FullConfiguration.TagPrefix);`
	`25`	`+ var versionInBranch = GetVersionInBranch(configuration.Branch.Name.Friendly, Context.Configuration.TagPrefix);`
`26`	`26`	`if (versionInBranch != null)`
`27`	`27`	`{`
`28`		`- var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.FullConfiguration);`
	`28`	`+ var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.Configuration);`
`29`	`29`	`var branchNameOverride = Context.CurrentBranch.Name.Friendly.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);`
`30`	`30`	`yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom.Commit, branchNameOverride);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer`
`97`	`97`	`commits = commits.Where(c => c.Parents.Count() > 1);`
`98`	`98`	`}`
`99`	`99`
`100`		`- return GetIncrementForCommits(context.FullConfiguration, commits);`
	`100`	`+ return GetIncrementForCommits(context.Configuration, commits);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex) =>`