diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md index e6ff9c896f..cc1b75e6fe 100644 --- a/BREAKING_CHANGES.md +++ b/BREAKING_CHANGES.md @@ -33,7 +33,11 @@ * Default `RegularExpression` for feature branches is changed from `^features?[/-]` to `^features?[/-](?.+)` to support using `{BranchName}` out-of-the-box * Default `RegularExpression` for unknown branches is changed from `.*` to `(?.*)` to support using `{BranchName}` out-of-the-box * The branch related property `is-mainline` in the configuration system has been renamed to `is-main-branch` - +* The versioning mode has been renamed to deployment mode and consists of following values: + * ManualDeployment (previously ContinuousDelivery) + * ContinuousDelivery (previously ContinuousDeployment) + * ContinuousDeployment (new) + ## v5.0.0 * Version numbers in branches other than `release` branches are no longer diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2e719ab73..da08a4f88a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ We can then customize the configuration by chaining methods of the builder. At t For example: ```csharp var configuration = configurationBuilder - .WithVersioningMode(VersioningMode.ContinuousDeployment) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithNextVersion("1.0.0") .Build(); ``` diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs index ea799abb7c..09a2eafd64 100644 --- a/build/build/Tasks/Test/UnitTest.cs +++ b/build/build/Tasks/Test/UnitTest.cs @@ -48,7 +48,7 @@ public override void OnError(Exception exception, BuildContext context) public override void Finally(BuildContext context) { var testResultsFiles = context.GetFiles($"{Paths.TestOutput}/*.results.xml"); - if (!context.IsAzurePipelineBuild || !testResultsFiles.Any()) return; + if (!context.IsAzurePipelineBuild || testResultsFiles.Count == 0) return; var data = new AzurePipelinesPublishTestResultsData { diff --git a/build/common/Utilities/Extensions.cs b/build/common/Utilities/Extensions.cs index a4e10948dc..74dd1f1ea7 100644 --- a/build/common/Utilities/Extensions.cs +++ b/build/common/Utilities/Extensions.cs @@ -38,7 +38,7 @@ public static string GetTaskArguments(this Type task) } var attributes = task.GetCustomAttributes().ToArray(); - if (attributes.Any()) + if (attributes.Length != 0) { var arguments = attributes.Select(attribute => $"[--{attribute.Name} ({string.Join(" | ", attribute.PossibleValues)})]"); return string.Join(" ", arguments); diff --git a/schemas/6.0/GitVersion.configuration.json b/schemas/6.0/GitVersion.configuration.json index 904b08caa8..273bdbb8bd 100644 --- a/schemas/6.0/GitVersion.configuration.json +++ b/schemas/6.0/GitVersion.configuration.json @@ -55,6 +55,9 @@ "commit-message-incrementing": { "$ref": "#/$defs/nullableOfCommitMessageIncrementMode" }, + "mode": { + "$ref": "#/$defs/nullableOfDeploymentMode" + }, "ignore": { "description": "The header property for the ignore configuration.", "type": "object", @@ -173,9 +176,6 @@ "default": "(?[vV]?\\d+(\\.\\d+)?(\\.\\d+)?).*", "type": "string" }, - "mode": { - "$ref": "#/$defs/nullableOfVersioningMode" - }, "workflow": { "description": "The base template of the configuration to use. Possible values are: 'GitFlow/v1' or 'GitHubFlow/v1'", "type": "string" @@ -188,6 +188,9 @@ "commit-message-incrementing": { "$ref": "#/$defs/nullableOfCommitMessageIncrementMode" }, + "mode": { + "$ref": "#/$defs/nullableOfDeploymentMode" + }, "increment": { "$ref": "#/$defs/incrementStrategy" }, @@ -226,9 +229,6 @@ }, "tracks-release-branches": { "$ref": "#/$defs/nullableOfBoolean5" - }, - "mode": { - "$ref": "#/$defs/nullableOfVersioningMode" } } }, @@ -240,6 +240,15 @@ "MergeMessageOnly" ] }, + "nullableOfDeploymentMode": { + "description": "The deployment mode for this branch. Can be 'ManualDeployment', 'ContinuousDelivery', 'ContinuousDeployment'.", + "enum": [ + "ManualDeployment", + "ContinuousDelivery", + "ContinuousDeployment", + "TrunkBased" + ] + }, "incrementStrategy": { "description": "The increment strategy for this branch. Can be 'Inherit', 'Patch', 'Minor', 'Major', 'None'.", "enum": [ @@ -330,14 +339,6 @@ "null" ] }, - "nullableOfVersioningMode": { - "description": "The versioning mode for this branch. Can be 'ContinuousDelivery', 'ContinuousDeployment', 'Mainline'.", - "enum": [ - "ContinuousDelivery", - "ContinuousDeployment", - "Mainline" - ] - }, "string3": { "format": "date-time", "description": "Commits before this date will be ignored. Format: yyyy-MM-ddTHH:mm:ss.", @@ -352,4 +353,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs index 6a87b1041b..9dd75e0c7e 100644 --- a/src/GitVersion.App.Tests/ArgumentParserTests.cs +++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs @@ -444,7 +444,7 @@ private static IEnumerable OverrideConfigWithSingleOptionTestData( "mode=ContinuousDelivery", new GitVersionConfiguration { - VersioningMode = VersioningMode.ContinuousDelivery + DeploymentMode = DeploymentMode.ContinuousDelivery } ); yield return new TestCaseData( @@ -567,7 +567,7 @@ private static IEnumerable OverrideConfigWithMultipleOptionsTestDa AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}", UpdateBuildNumber = true, AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag, - VersioningMode = VersioningMode.ContinuousDelivery, + DeploymentMode = DeploymentMode.ContinuousDelivery, TagPreReleaseWeight = 4 } ); diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs index 40ce91cd9a..0ccd5f74a7 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs @@ -51,8 +51,8 @@ public void OverwritesDefaultsWithProvidedConfig() var developConfiguration = configuration.Branches["develop"]; developConfiguration.Increment.ShouldBe(IncrementStrategy.Major); developConfiguration.Increment.ShouldNotBe(defaultConfiguration.Branches["develop"].Increment); - developConfiguration.VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery); - developConfiguration.VersioningMode.ShouldNotBe(defaultConfiguration.Branches["develop"].VersioningMode); + developConfiguration.DeploymentMode.ShouldBe(DeploymentMode.ContinuousDelivery); + developConfiguration.DeploymentMode.ShouldNotBe(defaultConfiguration.Branches["develop"].DeploymentMode); developConfiguration.Label.ShouldBe("dev"); } diff --git a/src/GitVersion.Configuration/BranchConfiguration.cs b/src/GitVersion.Configuration/BranchConfiguration.cs index 3c52f97a90..972c1e43b7 100644 --- a/src/GitVersion.Configuration/BranchConfiguration.cs +++ b/src/GitVersion.Configuration/BranchConfiguration.cs @@ -7,8 +7,8 @@ namespace GitVersion.Configuration; internal record BranchConfiguration : IBranchConfiguration { [JsonPropertyName("mode")] - [JsonPropertyDescription("The versioning mode for this branch. Can be 'ContinuousDelivery', 'ContinuousDeployment', 'Mainline'.")] - public VersioningMode? VersioningMode { get; internal set; } + [JsonPropertyDescription("The deployment mode for this branch. Can be 'ManualDeployment', 'ContinuousDelivery', 'ContinuousDeployment'.")] + public DeploymentMode? DeploymentMode { get; internal set; } [JsonPropertyName("label")] [JsonPropertyDescription("The label to use for this branch. Use the value {BranchName} or similar as a placeholder to insert a named capture group from RegularExpression (fx. the branch name).")] @@ -85,7 +85,7 @@ public virtual IBranchConfiguration Inherit(IBranchConfiguration configuration) return new BranchConfiguration(this) { Increment = Increment == IncrementStrategy.Inherit ? configuration.Increment : Increment, - VersioningMode = VersioningMode ?? configuration.VersioningMode, + DeploymentMode = DeploymentMode ?? configuration.DeploymentMode, Label = Label ?? configuration.Label, PreventIncrementOfMergedBranchVersion = PreventIncrementOfMergedBranchVersion ?? configuration.PreventIncrementOfMergedBranchVersion, diff --git a/src/GitVersion.Configuration/BranchConfigurationBuilder.cs b/src/GitVersion.Configuration/BranchConfigurationBuilder.cs index 4d35821fae..1df170ed06 100644 --- a/src/GitVersion.Configuration/BranchConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/BranchConfigurationBuilder.cs @@ -6,7 +6,7 @@ internal class BranchConfigurationBuilder { public static BranchConfigurationBuilder New => new(); - private VersioningMode? versioningMode; + private DeploymentMode? deploymentMode; private string? label; private IncrementStrategy increment; private bool? preventIncrementOfMergedBranchVersion; @@ -26,9 +26,9 @@ private BranchConfigurationBuilder() { } - public virtual BranchConfigurationBuilder WithVersioningMode(VersioningMode? value) + public virtual BranchConfigurationBuilder WithDeploymentMode(DeploymentMode? value) { - this.versioningMode = value; + this.deploymentMode = value; return this; } @@ -130,7 +130,7 @@ public virtual BranchConfigurationBuilder WithPreReleaseWeight(int? value) public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration value) { - WithVersioningMode(value.VersioningMode); + WithDeploymentMode(value.DeploymentMode); WithLabel(value.Label); WithIncrement(value.Increment); WithPreventIncrementOfMergedBranchVersion(value.PreventIncrementOfMergedBranchVersion); @@ -150,7 +150,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration public IBranchConfiguration Build() => new BranchConfiguration { - VersioningMode = versioningMode, + DeploymentMode = deploymentMode, Label = label, Increment = increment, RegularExpression = regularExpression, diff --git a/src/GitVersion.Configuration/ConfigurationBuilderBase.cs b/src/GitVersion.Configuration/ConfigurationBuilderBase.cs index 60b0753b53..8cc7e81ca4 100644 --- a/src/GitVersion.Configuration/ConfigurationBuilderBase.cs +++ b/src/GitVersion.Configuration/ConfigurationBuilderBase.cs @@ -27,7 +27,7 @@ internal abstract class ConfigurationBuilderBase : IConfi private Dictionary mergeMessageFormats = new(); private readonly List> overrides = new(); private readonly Dictionary branchConfigurationBuilders = new(); - private VersioningMode? versioningMode; + private DeploymentMode? versioningMode; private string? label; private IncrementStrategy increment = IncrementStrategy.Inherit; private bool? preventIncrementOfMergedBranchVersion; @@ -224,7 +224,7 @@ public virtual TConfigurationBuilder WithBranch(string value, Action b.Value.VersioningMode == VersioningMode.TrunkBased)) + if (configuration.Branches.Any(b => b.Value.DeploymentMode == DeploymentMode.TrunkBased)) { throw new ConfigurationException(@"TrunkBased mode only works at the repository level, a single branch cannot be put into TrunkBased mode diff --git a/src/GitVersion.Configuration/GitFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/GitFlowConfigurationBuilder.cs index 94297a9fab..763e43e91d 100644 --- a/src/GitVersion.Configuration/GitFlowConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/GitFlowConfigurationBuilder.cs @@ -22,7 +22,7 @@ private GitFlowConfigurationBuilder() VersionInBranchPattern = ConfigurationConstants.DefaultVersionInBranchPattern, TagPreReleaseWeight = ConfigurationConstants.DefaultTagPreReleaseWeight, UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber, - VersioningMode = VersioningMode.ContinuousDelivery, + DeploymentMode = DeploymentMode.ContinuousDelivery, RegularExpression = string.Empty, Label = ConfigurationConstants.BranchNamePlaceholder, Increment = IncrementStrategy.Inherit, @@ -70,7 +70,7 @@ private GitFlowConfigurationBuilder() WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.None, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, RegularExpression = ReleaseBranch.RegexPattern, SourceBranches = [ @@ -92,7 +92,7 @@ private GitFlowConfigurationBuilder() { Increment = IncrementStrategy.Inherit, RegularExpression = FeatureBranch.RegexPattern, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, SourceBranches = [ this.DevelopBranch.Name, @@ -110,7 +110,7 @@ private GitFlowConfigurationBuilder() { Increment = IncrementStrategy.Inherit, RegularExpression = PullRequestBranch.RegexPattern, - VersioningMode = VersioningMode.ContinuousDelivery, + DeploymentMode = DeploymentMode.ContinuousDelivery, SourceBranches = [ this.DevelopBranch.Name, @@ -129,7 +129,7 @@ private GitFlowConfigurationBuilder() { Increment = IncrementStrategy.Inherit, RegularExpression = HotfixBranch.RegexPattern, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, SourceBranches = [ this.ReleaseBranch.Name, @@ -160,7 +160,7 @@ private GitFlowConfigurationBuilder() { RegularExpression = UnknownBranch.RegexPattern, Label = ConfigurationConstants.BranchNamePlaceholder, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, Increment = IncrementStrategy.Inherit, SourceBranches = [ diff --git a/src/GitVersion.Configuration/GitHubFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/GitHubFlowConfigurationBuilder.cs index 1d78f0f634..9b792ae976 100644 --- a/src/GitVersion.Configuration/GitHubFlowConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/GitHubFlowConfigurationBuilder.cs @@ -22,7 +22,7 @@ private GitHubFlowConfigurationBuilder() VersionInBranchPattern = ConfigurationConstants.DefaultVersionInBranchPattern, TagPreReleaseWeight = ConfigurationConstants.DefaultTagPreReleaseWeight, UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber, - VersioningMode = VersioningMode.ContinuousDelivery, + DeploymentMode = DeploymentMode.ContinuousDelivery, RegularExpression = string.Empty, Label = ConfigurationConstants.BranchNamePlaceholder, Increment = IncrementStrategy.Inherit, @@ -53,7 +53,7 @@ private GitHubFlowConfigurationBuilder() { Increment = IncrementStrategy.None, RegularExpression = ReleaseBranch.RegexPattern, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, SourceBranches = [ this.MainBranch.Name, @@ -72,7 +72,7 @@ private GitHubFlowConfigurationBuilder() { Increment = IncrementStrategy.Inherit, RegularExpression = FeatureBranch.RegexPattern, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, SourceBranches = [ this.MainBranch.Name, @@ -87,7 +87,7 @@ private GitHubFlowConfigurationBuilder() { Increment = IncrementStrategy.Inherit, RegularExpression = PullRequestBranch.RegexPattern, - VersioningMode = VersioningMode.ContinuousDelivery, + DeploymentMode = DeploymentMode.ContinuousDelivery, SourceBranches = [ this.MainBranch.Name, @@ -103,7 +103,7 @@ private GitHubFlowConfigurationBuilder() { RegularExpression = UnknownBranch.RegexPattern, Label = ConfigurationConstants.BranchNamePlaceholder, - VersioningMode = VersioningMode.ManualDeployment, + DeploymentMode = DeploymentMode.ManualDeployment, Increment = IncrementStrategy.Inherit, SourceBranches = [ diff --git a/src/GitVersion.Configuration/Init/EditConfigStep.cs b/src/GitVersion.Configuration/Init/EditConfigStep.cs index 084b930c1e..786b7eefb0 100644 --- a/src/GitVersion.Configuration/Init/EditConfigStep.cs +++ b/src/GitVersion.Configuration/Init/EditConfigStep.cs @@ -55,7 +55,7 @@ protected override string GetPrompt(ConfigurationBuilder configurationBuilder, s 3) Set next version number 4) Branch specific configuration -5) Branch Increment mode (per commit/after tag) (Current: {configuration.VersioningMode ?? VersioningMode.ContinuousDeployment}) +5) Branch Increment mode (per commit/after tag) (Current: {configuration.DeploymentMode ?? DeploymentMode.ContinuousDeployment}) 6) Assembly versioning scheme (Current: {configuration.AssemblyVersioningScheme}) 7) Setup build scripts"; } diff --git a/src/GitVersion.Configuration/Init/SetConfig/ConfigureBranch.cs b/src/GitVersion.Configuration/Init/SetConfig/ConfigureBranch.cs index 329723147f..211ed15380 100644 --- a/src/GitVersion.Configuration/Init/SetConfig/ConfigureBranch.cs +++ b/src/GitVersion.Configuration/Init/SetConfig/ConfigureBranch.cs @@ -41,7 +41,7 @@ protected override string GetPrompt(ConfigurationBuilder configurationBuilder, s 0) Go Back 1) Branch Pr-release tag (Current: {branchConfiguration.Label}) -2) Branch Increment mode (per commit/after tag) (Current: {branchConfiguration.VersioningMode})"; +2) Branch Increment mode (per commit/after tag) (Current: {branchConfiguration.DeploymentMode})"; } protected override string DefaultResult => "0"; diff --git a/src/GitVersion.Configuration/Init/SetConfig/GlobalModeSetting.cs b/src/GitVersion.Configuration/Init/SetConfig/GlobalModeSetting.cs index 0462d37e86..3e965d0561 100644 --- a/src/GitVersion.Configuration/Init/SetConfig/GlobalModeSetting.cs +++ b/src/GitVersion.Configuration/Init/SetConfig/GlobalModeSetting.cs @@ -23,15 +23,15 @@ protected override StepResult HandleResult( switch (result) { case "1": - configurationBuilder.WithVersioningMode(VersioningMode.ContinuousDelivery); + configurationBuilder.WithDeploymentMode(DeploymentMode.ContinuousDelivery); steps.Enqueue(this.returnToStep); return StepResult.Ok(); case "2": - configurationBuilder.WithVersioningMode(VersioningMode.ContinuousDeployment); + configurationBuilder.WithDeploymentMode(DeploymentMode.ContinuousDeployment); steps.Enqueue(this.returnToStep); return StepResult.Ok(); case "3": - configurationBuilder.WithVersioningMode(VersioningMode.TrunkBased); + configurationBuilder.WithDeploymentMode(DeploymentMode.TrunkBased); steps.Enqueue(this.returnToStep); return StepResult.Ok(); case "0": diff --git a/src/GitVersion.Configuration/Init/SetConfig/SetBranchIncrementMode.cs b/src/GitVersion.Configuration/Init/SetConfig/SetBranchIncrementMode.cs index a2a01cf344..6c2c31d599 100644 --- a/src/GitVersion.Configuration/Init/SetConfig/SetBranchIncrementMode.cs +++ b/src/GitVersion.Configuration/Init/SetConfig/SetBranchIncrementMode.cs @@ -26,11 +26,11 @@ protected override StepResult HandleResult(string? result, Queue [TestFixture] -internal class ComparingTheBehaviorOfDifferentVersioningModes +internal class ComparingTheBehaviorOfDifferentDeploymentModes { private static readonly GitHubFlowConfigurationBuilder configurationBuilder = GitHubFlowConfigurationBuilder.New .WithLabel(null) @@ -20,27 +20,27 @@ internal class ComparingTheBehaviorOfDifferentVersioningModes ); private static readonly IGitVersionConfiguration trunkBased = configurationBuilder - .WithVersioningMode(VersioningMode.TrunkBased) - .WithBranch("main", _ => _.WithIsMainBranch(true).WithVersioningMode(VersioningMode.ContinuousDeployment)) - .WithBranch("feature", _ => _.WithIsMainBranch(false).WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithDeploymentMode(DeploymentMode.TrunkBased) + .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDeployment)) + .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); private static readonly IGitVersionConfiguration continuousDeployment = configurationBuilder - .WithVersioningMode(VersioningMode.ContinuousDeployment) - .WithBranch("main", _ => _.WithIsMainBranch(true).WithVersioningMode(VersioningMode.ContinuousDeployment)) - .WithBranch("feature", _ => _.WithIsMainBranch(false).WithVersioningMode(VersioningMode.ContinuousDeployment)) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) + .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDeployment)) + .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ContinuousDeployment)) .Build(); private static readonly IGitVersionConfiguration continuousDelivery = configurationBuilder - .WithVersioningMode(VersioningMode.ContinuousDelivery) - .WithBranch("main", _ => _.WithIsMainBranch(true).WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("feature", _ => _.WithIsMainBranch(false).WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) + .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); private static readonly IGitVersionConfiguration manualDeployment = configurationBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) - .WithBranch("main", _ => _.WithIsMainBranch(true).WithVersioningMode(VersioningMode.ManualDeployment)) - .WithBranch("feature", _ => _.WithIsMainBranch(false).WithVersioningMode(VersioningMode.ManualDeployment)) + .WithDeploymentMode(DeploymentMode.ManualDeployment) + .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ManualDeployment)) + .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ManualDeployment)) .Build(); [Test] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs index 3dfed43092..a2cc3db30f 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs @@ -12,10 +12,10 @@ public void ShouldUseTheFallbackVersionOnMainWhenNoVersionsAreAvailable() // * 2373a87 58 minutes ago (HEAD -> main) var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithBranch("main", builder => builder .WithLabel("ci") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) ) .Build(); @@ -35,7 +35,7 @@ public void ShouldUseTheFallbackVersionOnDevelopWhenNoVersionsAreAvailable() // * a831d61 58 minutes ago (HEAD -> develop) var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .Build(); using var fixture = new EmptyRepositoryFixture("develop"); @@ -55,10 +55,10 @@ public void ShouldUseConfiguredNextVersionOnMainWhenNoHigherVersionsAvailable() var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.0.0") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithBranch("main", builder => builder .WithLabel("ci") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) ) .Build(); @@ -79,7 +79,7 @@ public void ShouldNotMatterWhenConfiguredNextVersionIsEqualsToTheTaggeVersion() var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.0.0") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -98,7 +98,7 @@ public void ShouldUseTaggedVersionWhenGreaterThanConfiguredNextVersion() // * ba74727 58 minutes ago (HEAD -> main, tag: 1.1.0) var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithNextVersion("1.0.0").Build(); using var fixture = new EmptyRepositoryFixture(); @@ -121,12 +121,12 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromMainToFeatureBranch() // *ec77f9c 58 minutes ago var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithBranch("main", builder => builder .WithLabel("ci") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) ) - .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -174,9 +174,9 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromDevelopToFeatureBranc // *67acc03 58 minutes ago(main) var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) - .WithBranch("develop", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) + .WithBranch("develop", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -226,10 +226,10 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromReleaseToFeatureBranc // *f63a536 58 minutes ago(main) var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("release", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("release", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -283,14 +283,14 @@ public void ShouldFallbackToTheVersionOnDevelopLikeTheReleaseWasNeverCreatedWhen var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", builder => builder .WithLabel("ci") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithTrackMergeTarget(false) ) .WithBranch("develop", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery).WithTrackMergeTarget(false) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery).WithTrackMergeTarget(false) ) .WithBranch("release", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery).WithTrackMergeTarget(false) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery).WithTrackMergeTarget(false) ) .Build(); @@ -369,15 +369,15 @@ public void ShouldConsiderTheMergeCommitFromMainToDevelopWhenReleaseHasBeenMerge var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", builder => builder .WithLabel("ci") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithTrackMergeTarget(false) ) .WithBranch("develop", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithTrackMergeTarget(false) ) .WithBranch("release", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithTrackMergeTarget(false) ) .Build(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs index 6e0189042e..0bda894402 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs @@ -106,7 +106,7 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMainDoesBumpDevelopV public void CanHandleContinuousDelivery() { var configuration = GitFlowConfigurationBuilder.New - .WithBranch("develop", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("develop", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -213,9 +213,9 @@ public void TagOnHotfixShouldNotAffectDevelop() public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish() { var configuration = GitFlowConfigurationBuilder.New - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("develop", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("release", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("develop", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("release", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -255,9 +255,9 @@ public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish() public void CommitsSinceVersionSourceShouldNotGoDownUponMergingFeatureOnlyToDevelop() { var configuration = GitFlowConfigurationBuilder.New - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("develop", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) - .WithBranch("release", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("develop", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) + .WithBranch("release", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -304,12 +304,12 @@ public void PreviousPreReleaseTagShouldBeRespectedWhenCountingCommits() public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingReleaseToDevelop() { var configuration = GitFlowConfigurationBuilder.New - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .WithBranch("develop", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithPreventIncrementOfMergedBranchVersion(false) ) - .WithBranch("release", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("release", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -349,7 +349,7 @@ public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommi public void WhenPreventIncrementOfMergedBranchVersionIsSetToTrueForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingReleaseToDevelop() { var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithBranch("develop", builder => builder.WithPreventIncrementOfMergedBranchVersion(true)) .Build(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs index 89a9c60992..db04e4a8fb 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs @@ -158,8 +158,8 @@ public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMa fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow()); var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ContinuousDelivery) - .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) + .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); fixture.AssertFullSemver("1.2.0-longrunning.2", configuration); } @@ -422,7 +422,7 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack() public void PickUpVersionFromMainMarkedWithIsTracksReleaseBranches() { var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithBranch("unknown", builder => builder.WithIncrement(IncrementStrategy.Patch).WithTracksReleaseBranches(true)) .WithBranch(MainBranch, builder => builder.WithLabel("pre").WithTracksReleaseBranches(true)) .WithBranch("release", builder => builder.WithLabel("rc").WithTracksReleaseBranches(true)) @@ -453,11 +453,11 @@ public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature() var configuration = GitFlowConfigurationBuilder.New .WithAssemblyVersioningScheme(AssemblyVersioningScheme.Major) .WithAssemblyFileVersioningFormat("{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}") - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .WithBranch("develop", builder => builder.WithPreventIncrementOfMergedBranchVersion(true)) .WithBranch("feature", builder => builder .WithLabel($"feat-{ConfigurationConstants.BranchNamePlaceholder}") - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) ) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) .Build(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs index 27f09099f6..fbe290046c 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs @@ -12,7 +12,7 @@ public class MainScenarios : TestBase public void CanHandleManualDeployment() { var configuration = GitFlowConfigurationBuilder.New - .WithBranch(MainBranch, builder => builder.WithVersioningMode(VersioningMode.ManualDeployment)) + .WithBranch(MainBranch, builder => builder.WithDeploymentMode(DeploymentMode.ManualDeployment)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -26,7 +26,7 @@ public void CanHandleContinuousDelivery() { var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", builder => builder - .WithLabel("ci").WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithLabel("ci").WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .Build(); using var fixture = new EmptyRepositoryFixture(); @@ -40,7 +40,7 @@ public void CanHandleContinuousDeployment() { var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", builder => builder - .WithLabel("ci").WithVersioningMode(VersioningMode.ContinuousDeployment)) + .WithLabel("ci").WithDeploymentMode(DeploymentMode.ContinuousDeployment)) .Build(); using var fixture = new EmptyRepositoryFixture(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs index d852172263..a1c52e27be 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs @@ -195,7 +195,7 @@ public void EnsurePreReleaseTagLabelWillBeConsideredIfNoLabelIsDefined(long patc var configuration = GitHubFlowConfigurationBuilder.New .WithLabel(null) .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel(null).WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -260,7 +260,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagForPatchNumberOneWillBeConside var configuration = GitHubFlowConfigurationBuilder.New .WithLabel(null) .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel(null).WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -327,7 +327,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagForPatchNumberTwoAndThreeWillB var configuration = GitHubFlowConfigurationBuilder.New .WithLabel(null) .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel(null).WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -394,7 +394,7 @@ public void EnsurePreReleaseTagLabelWillBeConsideredIfLabelIsEmpty(long patchNum { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel(string.Empty).WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -458,7 +458,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagWillBeConsideredIfLabelIsEmpty { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel(string.Empty).WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -524,7 +524,7 @@ public void EnsurePreReleaseTagLabelWillBeConsideredIfAlphaLabelIsDefined(long p var configuration = GitHubFlowConfigurationBuilder.New .WithLabel(null) .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("alpha").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -591,7 +591,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagWillBeConsideredIfAlphaLabelIs var configuration = GitHubFlowConfigurationBuilder.New .WithLabel(null) .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("alpha").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -658,7 +658,7 @@ public void EnsurePreReleaseTagLabelWillBeConsideredIfBetaLabelIsDefined(long pa { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("beta").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -722,7 +722,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagWillBeConsideredIfBetaLabelIsD { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("beta").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -787,7 +787,7 @@ public void EnsurePreReleaseTagLabelWillBeConsideredIfGammaLabelIsDefined(long p { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("gamma").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -851,7 +851,7 @@ public void EnsurePreReleaseTagLabelWithInitialTagWillBeConsideredIfGammaLabelIs { var configuration = GitHubFlowConfigurationBuilder.New .WithBranch("main", branchBuilder => branchBuilder - .WithVersioningMode(VersioningMode.ManualDeployment) + .WithDeploymentMode(DeploymentMode.ManualDeployment) .WithLabel("gamma").WithIncrement(IncrementStrategy.Patch) ).Build(); @@ -916,7 +916,7 @@ public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAnd var configuration = GitFlowConfigurationBuilder.New.WithLabel(null) .WithBranch("main", _ => _ .WithCommitMessageIncrementing(CommitMessageIncrementMode.Enabled) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithIncrement(IncrementStrategy.None) .WithLabel(label) .WithIsMainBranch(false) @@ -957,7 +957,7 @@ public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAnd var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", _ => _ .WithCommitMessageIncrementing(CommitMessageIncrementMode.Enabled) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithIncrement(IncrementStrategy.None) .WithLabel("pre") .WithIsMainBranch(false) @@ -1000,7 +1000,7 @@ public void ShouldProvideTheCorrectVersionEvenIfPreReleaseLabelExistsInTheGitTag .WithBranch("main", _ => _ .WithLabel("beta") .WithIncrement(IncrementStrategy.Patch) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithIsMainBranch(false) ).Build(); @@ -1040,7 +1040,7 @@ public void EnsureThePreReleaseTagIsCorrectlyGeneratedWhenPreReleaseLabelIsEmpty var configuration = GitFlowConfigurationBuilder.New .WithBranch("main", _ => _ .WithLabel(string.Empty).WithIsMainBranch(false) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) ).Build(); using var fixture = new EmptyRepositoryFixture("main"); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs index 73b0adb249..06f72983f5 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs @@ -8,31 +8,31 @@ namespace GitVersion.Core.Tests.IntegrationTests; public class TrunkBasedDevelopmentScenarios : TestBase { private static GitFlowConfigurationBuilder GetConfigurationBuilder() => GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.TrunkBased) + .WithDeploymentMode(DeploymentMode.TrunkBased) .WithBranch("main", builder => builder .WithIsMainBranch(true).WithIncrement(IncrementStrategy.Patch) - .WithVersioningMode(VersioningMode.ContinuousDeployment) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithSourceBranches() ) .WithBranch("develop", builder => builder .WithIsMainBranch(false).WithIncrement(IncrementStrategy.Minor) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithSourceBranches("main") ) .WithBranch("feature", builder => builder .WithIsMainBranch(false).WithIncrement(IncrementStrategy.Minor) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithSourceBranches("main") ) .WithBranch("hotfix", builder => builder .WithIsMainBranch(false).WithIncrement(IncrementStrategy.Patch) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithRegularExpression("^hotfix[/-](?.+)").WithLabel("{BranchName}") .WithSourceBranches("main") ) .WithBranch("pull-request", builder => builder .WithIsMainBranch(false).WithIncrement(IncrementStrategy.Inherit) - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithSourceBranches("main") ); @@ -487,7 +487,7 @@ public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionO { var configuration = GetConfigurationBuilder() .WithBranch("feature", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithIncrement(IncrementStrategy.Minor) ) .Build(); @@ -511,13 +511,13 @@ public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionO public void VerifyIncrementConfigIsHonoured() { var minorIncrementConfig = GitFlowConfigurationBuilder.New - .WithVersioningMode(VersioningMode.TrunkBased) + .WithDeploymentMode(DeploymentMode.TrunkBased) .WithBranch("main", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDeployment) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithIncrement(IncrementStrategy.None) ) .WithBranch("feature", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery) .WithIncrement(IncrementStrategy.None) ) .Build(); @@ -590,7 +590,7 @@ public void VerifyIncrementConfigIsHonoured() public void BranchWithoutMergeBaseMainlineBranchIsFound() { var configuration = GetConfigurationBuilder() - .WithBranch("unknown", builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery)) + .WithBranch("unknown", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDelivery)) .WithAssemblyFileVersioningScheme(AssemblyFileVersioningScheme.MajorMinorPatchTag) .Build(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs index 3a988a7617..a977c7f0eb 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs @@ -86,8 +86,8 @@ public void CanUseConventionalCommitsToBumpVersion(string commitMessage, string .WithMinorVersionBumpMessage("^(feat)(\\([\\w\\s-]*\\))?:") // For future debugging of this regex: https://regex101.com/r/oFpqxA/2 .WithPatchVersionBumpMessage("^(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s-]*\\))?:") - .WithVersioningMode(VersioningMode.TrunkBased) - .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.ContinuousDeployment)) + .WithDeploymentMode(DeploymentMode.TrunkBased) + .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDeployment)) .Build(); using var fixture = new EmptyRepositoryFixture(); diff --git a/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs index 91a33b7924..1055e06f55 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs @@ -10,13 +10,13 @@ public class EffectiveBranchConfigurationFinderTests { [Theory] public void When_getting_configurations_of_a_branch_without_versioning_mode_Given_fallback_configuaration_with_versioning_mode_Then_result_should_have_versioning_mode( - VersioningMode versioningMode) + DeploymentMode versioningMode) { // Arrange var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit()); var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(versioningMode) - .WithBranch("main", builder => builder.WithVersioningMode(null)) + .WithDeploymentMode(versioningMode) + .WithBranch("main", builder => builder.WithDeploymentMode(null)) .Build(); var repositoryStoreMock = Substitute.For(); repositoryStoreMock.GetSourceBranches(branchMock, configuration, Arg.Any>()).Returns([]); @@ -29,20 +29,20 @@ public void When_getting_configurations_of_a_branch_without_versioning_mode_Give // Assert actual.ShouldHaveSingleItem(); actual[0].Branch.ShouldBe(branchMock); - actual[0].Value.VersioningMode.ShouldBe(versioningMode); + actual[0].Value.DeploymentMode.ShouldBe(versioningMode); } [Theory] public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_fallback_configuaration_without_versioning_mode_Then_result_should_have_versioning_mode( - VersioningMode versioningMode) + DeploymentMode versioningMode) { // Arrange var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit()); var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit()); var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(null) - .WithBranch("main", builder => builder.WithVersioningMode(versioningMode)) - .WithBranch("develop", builder => builder.WithVersioningMode(null).WithIncrement(IncrementStrategy.Inherit)) + .WithDeploymentMode(null) + .WithBranch("main", builder => builder.WithDeploymentMode(versioningMode)) + .WithBranch("develop", builder => builder.WithDeploymentMode(null).WithIncrement(IncrementStrategy.Inherit)) .Build(); var repositoryStoreMock = Substitute.For(); repositoryStoreMock.GetSourceBranches(developBranchMock, configuration, Arg.Any>()).Returns(new[] { mainBranchMock }); @@ -55,21 +55,21 @@ public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_f // Assert actual.ShouldHaveSingleItem(); actual[0].Branch.ShouldBe(mainBranchMock); - actual[0].Value.VersioningMode.ShouldBe(versioningMode); + actual[0].Value.DeploymentMode.ShouldBe(versioningMode); } [Theory] public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_parent_configuaration_with_versioning_mode_Then_result_should_not_have_versioning_mode_of_parent( - VersioningMode versioningMode) + DeploymentMode versioningMode) { // Arrange var mainBranchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit()); var developBranchMock = GitToolsTestingExtensions.CreateMockBranch("develop", GitToolsTestingExtensions.CreateMockCommit()); var configuration = GitFlowConfigurationBuilder.New - .WithVersioningMode(null) - .WithBranch("main", builder => builder.WithVersioningMode(versioningMode)) + .WithDeploymentMode(null) + .WithBranch("main", builder => builder.WithDeploymentMode(versioningMode)) .WithBranch("develop", builder => builder - .WithVersioningMode(VersioningMode.ContinuousDelivery).WithIncrement(IncrementStrategy.Inherit) + .WithDeploymentMode(DeploymentMode.ContinuousDelivery).WithIncrement(IncrementStrategy.Inherit) ) .Build(); @@ -84,13 +84,13 @@ public void When_getting_configurations_of_a_branch_with_versioning_mode_Given_p // Assert actual.ShouldHaveSingleItem(); actual[0].Branch.ShouldBe(mainBranchMock); - if (versioningMode == VersioningMode.ContinuousDelivery) + if (versioningMode == DeploymentMode.ContinuousDelivery) { - actual[0].Value.VersioningMode.ShouldBe(versioningMode); + actual[0].Value.DeploymentMode.ShouldBe(versioningMode); } else { - actual[0].Value.VersioningMode.ShouldNotBe(versioningMode); + actual[0].Value.DeploymentMode.ShouldNotBe(versioningMode); } } @@ -156,7 +156,7 @@ public void UsesFirstBranchConfigWhenMultipleMatch(string branchName, IncrementS var releaseBranchMock = GitToolsTestingExtensions.CreateMockBranch(branchName, GitToolsTestingExtensions.CreateMockCommit()); var branchConfiguration = new BranchConfiguration { - VersioningMode = VersioningMode.TrunkBased, + DeploymentMode = DeploymentMode.TrunkBased, Increment = IncrementStrategy.None, PreventIncrementOfMergedBranchVersion = false, TrackMergeTarget = false, @@ -169,14 +169,14 @@ public void UsesFirstBranchConfigWhenMultipleMatch(string branchName, IncrementS .WithoutBranches() .WithBranch("release/latest", builder => builder .WithConfiguration(branchConfiguration) - .WithVersioningMode(VersioningMode.ContinuousDeployment) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithIncrement(IncrementStrategy.None) .WithLabel("latest") .WithRegularExpression("release/latest") ) .WithBranch("release", builder => builder .WithConfiguration(branchConfiguration) - .WithVersioningMode(VersioningMode.ContinuousDeployment) + .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithIncrement(IncrementStrategy.Patch) .WithLabel("not-latest") .WithRegularExpression("releases?[/-]") diff --git a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs index ae3d57c9d9..e2362a17ba 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs @@ -91,8 +91,8 @@ // { // var configuration = GitFlowConfigurationBuilder.New // .WithNextVersion("1.0.0") -// .WithBranch("unknown", builder => builder.WithVersioningMode(VersioningMode.Mainline)) -// .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("unknown", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) +// .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // using var fixture = new EmptyRepositoryFixture(); @@ -108,7 +108,7 @@ // { // var configuration = GitFlowConfigurationBuilder.New // .WithNextVersion("1.0.0") -// .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // using var fixture = new EmptyRepositoryFixture(); @@ -125,8 +125,8 @@ // public void MergeFeatureIntoMainline() // { // var configuration = GitFlowConfigurationBuilder.New -// .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.Mainline)) -// .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) +// .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // using var fixture = new EmptyRepositoryFixture(); @@ -148,9 +148,9 @@ // public void MergeFeatureIntoMainlineWithMinorIncrement() // { // var configuration = GitFlowConfigurationBuilder.New -// .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .WithBranch("feature", builder => builder -// .WithVersioningMode(VersioningMode.Mainline) +// .WithDeploymentMode(DeploymentMode.Mainline) // .WithIncrement(IncrementStrategy.Minor) // ) // .Build(); @@ -174,11 +174,11 @@ // public void MergeFeatureIntoMainlineWithMinorIncrementAndThenMergeHotfix() // { // var configuration = GitFlowConfigurationBuilder.New -// .WithVersioningMode(VersioningMode.Mainline) +// .WithDeploymentMode(DeploymentMode.Mainline) // .WithBranch("feature", builder => builder // .WithIncrement(IncrementStrategy.Minor) -// .WithVersioningMode(VersioningMode.Mainline)) -// .WithBranch("hotfix", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithDeploymentMode(DeploymentMode.Mainline)) +// .WithBranch("hotfix", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // using var fixture = new EmptyRepositoryFixture(); @@ -234,7 +234,7 @@ // var configuration = GitFlowConfigurationBuilder.New // .WithBranch("main", builder => builder.WithLabel("beta")) // .WithBranch("feature", builder => builder -// .WithVersioningMode(VersioningMode.ContinuousDelivery) +// .WithDeploymentMode(DeploymentMode.ContinuousDelivery) // ) // .Build(); @@ -258,7 +258,7 @@ // { // var configuration = GitFlowConfigurationBuilder.New // .WithNextVersion("1.0.0") -// .WithBranch("feature", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("feature", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // using var fixture = new EmptyRepositoryFixture(); @@ -470,7 +470,7 @@ // // Arrange // var branchMock = GitToolsTestingExtensions.CreateMockBranch("main", GitToolsTestingExtensions.CreateMockCommit()); // var configuration = GitFlowConfigurationBuilder.New -// .WithBranch("main", builder => builder.WithVersioningMode(VersioningMode.Mainline)) +// .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.Mainline)) // .Build(); // var context = new GitVersionContext(branchMock, null, configuration, null, 0); // var repositoryStoreMock = Substitute.For(); diff --git a/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs index f8f9c7e52f..f3d8a9b295 100644 --- a/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs +++ b/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs @@ -18,7 +18,7 @@ public EffectiveConfiguration(IGitVersionConfiguration configuration, IBranchCon var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration(); branchConfiguration = branchConfiguration.Inherit(fallbackBranchConfiguration); - if (!branchConfiguration.VersioningMode.HasValue) + if (!branchConfiguration.DeploymentMode.HasValue) throw new("Configuration value for 'Versioning mode' has no value. (this should not happen, please report an issue)"); if (!configuration.AssemblyVersioningScheme.HasValue) @@ -38,7 +38,7 @@ public EffectiveConfiguration(IGitVersionConfiguration configuration, IBranchCon AssemblyInformationalFormat = configuration.AssemblyInformationalFormat; AssemblyVersioningFormat = configuration.AssemblyVersioningFormat; AssemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat; - VersioningMode = branchConfiguration.VersioningMode.Value; + DeploymentMode = branchConfiguration.DeploymentMode.Value; TagPrefix = configuration.TagPrefix; VersionInBranchRegex = configuration.VersionInBranchRegex; Label = branchConfiguration.Label; @@ -70,7 +70,7 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, - VersioningMode versioningMode, + DeploymentMode versioningMode, string? tagPrefix, string label, string? nextVersion, @@ -99,7 +99,7 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche AssemblyInformationalFormat = assemblyInformationalFormat; AssemblyVersioningFormat = assemblyVersioningFormat; AssemblyFileVersioningFormat = assemblyFileVersioningFormat; - VersioningMode = versioningMode; + DeploymentMode = versioningMode; TagPrefix = tagPrefix; Label = label; NextVersion = nextVersion; @@ -127,7 +127,7 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche public bool TracksReleaseBranches { get; } public bool IsReleaseBranch { get; } public bool IsMainBranch { get; } - public VersioningMode VersioningMode { get; } + public DeploymentMode DeploymentMode { get; } public AssemblyVersioningScheme AssemblyVersioningScheme { get; } public AssemblyFileVersioningScheme AssemblyFileVersioningScheme { get; } public string? AssemblyInformationalFormat { get; } diff --git a/src/GitVersion.Core/Configuration/IBranchConfiguration.cs b/src/GitVersion.Core/Configuration/IBranchConfiguration.cs index 2d86d72483..1da6adfe70 100644 --- a/src/GitVersion.Core/Configuration/IBranchConfiguration.cs +++ b/src/GitVersion.Core/Configuration/IBranchConfiguration.cs @@ -5,7 +5,7 @@ namespace GitVersion.Configuration; public interface IBranchConfiguration { - VersioningMode? VersioningMode { get; } + DeploymentMode? DeploymentMode { get; } string? Label { get; } diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt index d350b6be5c..86db54b030 100644 --- a/src/GitVersion.Core/PublicAPI.Unshipped.txt +++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt @@ -123,11 +123,12 @@ GitVersion.Configuration.EffectiveConfiguration.AssemblyFileVersioningScheme.get GitVersion.Configuration.EffectiveConfiguration.AssemblyInformationalFormat.get -> string? GitVersion.Configuration.EffectiveConfiguration.AssemblyVersioningFormat.get -> string? GitVersion.Configuration.EffectiveConfiguration.AssemblyVersioningScheme.get -> GitVersion.Extensions.AssemblyVersioningScheme +GitVersion.Configuration.EffectiveConfiguration.DeploymentMode.get -> GitVersion.VersionCalculation.DeploymentMode GitVersion.Configuration.EffectiveConfiguration.RegularExpression.get -> string? GitVersion.Configuration.EffectiveConfiguration.CommitDateFormat.get -> string? GitVersion.Configuration.EffectiveConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.Configuration.IBranchConfiguration! branchConfiguration) -> void -GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? tagPrefix, string! label, string? nextVersion, GitVersion.IncrementStrategy increment, string? regularExpression, bool preventIncrementOfMergedBranchVersion, string? labelNumberPattern, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainBranch, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int tagPreReleaseWeight) -> void +GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.DeploymentMode versioningMode, string? tagPrefix, string! label, string? nextVersion, GitVersion.IncrementStrategy increment, string? regularExpression, bool preventIncrementOfMergedBranchVersion, string? labelNumberPattern, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainBranch, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int tagPreReleaseWeight) -> void GitVersion.Configuration.EffectiveConfiguration.Increment.get -> GitVersion.IncrementStrategy GitVersion.Configuration.EffectiveConfiguration.IsMainBranch.get -> bool GitVersion.Configuration.EffectiveConfiguration.IsReleaseBranch.get -> bool @@ -150,9 +151,9 @@ GitVersion.Configuration.EffectiveConfiguration.TracksReleaseBranches.get -> boo GitVersion.Configuration.EffectiveConfiguration.UpdateBuildNumber.get -> bool GitVersion.Configuration.EffectiveConfiguration.VersionFilters.get -> System.Collections.Generic.IEnumerable! GitVersion.Configuration.EffectiveConfiguration.VersionInBranchRegex.get -> System.Text.RegularExpressions.Regex! -GitVersion.Configuration.EffectiveConfiguration.VersioningMode.get -> GitVersion.VersionCalculation.VersioningMode GitVersion.Configuration.IBranchConfiguration GitVersion.Configuration.IBranchConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode? +GitVersion.Configuration.IBranchConfiguration.DeploymentMode.get -> GitVersion.VersionCalculation.DeploymentMode? GitVersion.Configuration.IBranchConfiguration.Empty() -> GitVersion.Configuration.IBranchConfiguration! GitVersion.Configuration.IBranchConfiguration.Increment.get -> GitVersion.IncrementStrategy GitVersion.Configuration.IBranchConfiguration.Inherit(GitVersion.Configuration.IBranchConfiguration! configuration) -> GitVersion.Configuration.IBranchConfiguration! @@ -169,7 +170,6 @@ GitVersion.Configuration.IBranchConfiguration.SourceBranches.get -> System.Colle GitVersion.Configuration.IBranchConfiguration.TrackMergeMessage.get -> bool? GitVersion.Configuration.IBranchConfiguration.TrackMergeTarget.get -> bool? GitVersion.Configuration.IBranchConfiguration.TracksReleaseBranches.get -> bool? -GitVersion.Configuration.IBranchConfiguration.VersioningMode.get -> GitVersion.VersionCalculation.VersioningMode? GitVersion.Configuration.IConfigurationFileLocator GitVersion.Configuration.IConfigurationFileLocator.ReadConfiguration(string? configFilePath) -> GitVersion.Configuration.IGitVersionConfiguration! GitVersion.Configuration.IConfigurationFileLocator.ReadOverrideConfiguration(string? configFilePath) -> System.Collections.Generic.IReadOnlyDictionary? @@ -690,6 +690,11 @@ GitVersion.VersionCalculation.CommitMessageIncrementMode GitVersion.VersionCalculation.CommitMessageIncrementMode.Disabled = 1 -> GitVersion.VersionCalculation.CommitMessageIncrementMode GitVersion.VersionCalculation.CommitMessageIncrementMode.Enabled = 0 -> GitVersion.VersionCalculation.CommitMessageIncrementMode GitVersion.VersionCalculation.CommitMessageIncrementMode.MergeMessageOnly = 2 -> GitVersion.VersionCalculation.CommitMessageIncrementMode +GitVersion.VersionCalculation.DeploymentMode +GitVersion.VersionCalculation.DeploymentMode.ContinuousDelivery = 1 -> GitVersion.VersionCalculation.DeploymentMode +GitVersion.VersionCalculation.DeploymentMode.ContinuousDeployment = 2 -> GitVersion.VersionCalculation.DeploymentMode +GitVersion.VersionCalculation.DeploymentMode.ManualDeployment = 0 -> GitVersion.VersionCalculation.DeploymentMode +GitVersion.VersionCalculation.DeploymentMode.TrunkBased = 3 -> GitVersion.VersionCalculation.DeploymentMode GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable! GitVersion.VersionCalculation.IIncrementStrategyFinder @@ -718,17 +723,12 @@ GitVersion.VersionCalculation.NextVersion.NextVersion(GitVersion.SemanticVersion GitVersion.VersionCalculation.VersionCalculationModule GitVersion.VersionCalculation.VersionCalculationModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void GitVersion.VersionCalculation.VersionCalculationModule.VersionCalculationModule() -> void -GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery = 1 -> GitVersion.VersionCalculation.VersioningMode -GitVersion.VersionCalculation.VersioningMode.ContinuousDeployment = 2 -> GitVersion.VersionCalculation.VersioningMode -GitVersion.VersionCalculation.VersioningMode.ManualDeployment = 0 -> GitVersion.VersionCalculation.VersioningMode -GitVersion.VersionCalculation.VersioningMode.TrunkBased = 3 -> GitVersion.VersionCalculation.VersioningMode GitVersion.VersionCalculation.VersionStrategyBase GitVersion.VersionCalculation.VersionStrategyBase.Context.get -> GitVersion.GitVersionContext! GitVersion.VersionCalculation.VersionStrategyBase.VersionStrategyBase(System.Lazy! versionContext) -> void GitVersion.VersionCalculation.VersionStrategyModule GitVersion.VersionCalculation.VersionStrategyModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void GitVersion.VersionCalculation.VersionStrategyModule.VersionStrategyModule() -> void -GitVersion.VersionCalculation.VersioningMode GitVersion.VersionField GitVersion.VersionField.Major = 3 -> GitVersion.VersionField GitVersion.VersionField.Minor = 2 -> GitVersion.VersionField diff --git a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs b/src/GitVersion.Core/VersionCalculation/DeploymentMode.cs similarity index 83% rename from src/GitVersion.Core/VersionCalculation/VersioningMode.cs rename to src/GitVersion.Core/VersionCalculation/DeploymentMode.cs index 8df38f8942..def5b72b1c 100644 --- a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs +++ b/src/GitVersion.Core/VersionCalculation/DeploymentMode.cs @@ -1,6 +1,6 @@ namespace GitVersion.VersionCalculation; -public enum VersioningMode +public enum DeploymentMode { ManualDeployment, ContinuousDelivery, diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs index f6a6faa9f3..a3fe2c45dd 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs @@ -32,19 +32,19 @@ public virtual NextVersion FindVersion() } var nextVersion = CalculateNextVersion(Context.CurrentBranch, Context.Configuration); - var incrementedVersion = CalculateIncrementedVersion(nextVersion.Configuration.VersioningMode, nextVersion); + var incrementedVersion = CalculateIncrementedVersion(nextVersion.Configuration.DeploymentMode, nextVersion); return new(incrementedVersion, nextVersion.BaseVersion, nextVersion.BranchConfiguration); } - private SemanticVersion CalculateIncrementedVersion(VersioningMode versioningMode, NextVersion nextVersion) + private SemanticVersion CalculateIncrementedVersion(DeploymentMode versioningMode, NextVersion nextVersion) { IVersionModeCalculator calculator = versioningMode switch { - VersioningMode.ManualDeployment => versionModeCalculators.SingleOfType(), - VersioningMode.ContinuousDelivery => versionModeCalculators.SingleOfType(), - VersioningMode.ContinuousDeployment => versionModeCalculators.SingleOfType(), - _ => throw new InvalidEnumArgumentException(nameof(versioningMode), (int)versioningMode, typeof(VersioningMode)), + DeploymentMode.ManualDeployment => versionModeCalculators.SingleOfType(), + DeploymentMode.ContinuousDelivery => versionModeCalculators.SingleOfType(), + DeploymentMode.ContinuousDeployment => versionModeCalculators.SingleOfType(), + _ => throw new InvalidEnumArgumentException(nameof(versioningMode), (int)versioningMode, typeof(DeploymentMode)), }; return calculator.Calculate(nextVersion); } diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs index f0fb49702b..5477d80310 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs @@ -19,7 +19,7 @@ internal class MergeMessageVersionStrategy(ILog log, Lazy ver public override IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { - if (!configuration.Value.TrackMergeMessage || Context.Configuration.VersioningMode == VersioningMode.TrunkBased) + if (!configuration.Value.TrackMergeMessage || Context.Configuration.DeploymentMode == DeploymentMode.TrunkBased) return []; var commitsPriorToThan = Context.CurrentBranch.Commits.GetCommitsPriorTo(Context.CurrentCommit.When); diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs index 1c66fbd30c..7b51852061 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs @@ -15,7 +15,7 @@ internal sealed class TaggedCommitVersionStrategy(ITaggedSemanticVersionReposito private readonly ITaggedSemanticVersionRepository taggedSemanticVersionRepository = taggedSemanticVersionRepository.NotNull(); public override IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) - => Context.Configuration.VersioningMode == VersioningMode.TrunkBased ? [] + => Context.Configuration.DeploymentMode == DeploymentMode.TrunkBased ? [] : GetTaggedSemanticVersions(configuration).Select(CreateBaseVersion); private IEnumerable GetTaggedSemanticVersions(EffectiveBranchConfiguration configuration) diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs index b4a1cc1c0b..1d3f88601b 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs @@ -29,7 +29,7 @@ internal class TrackReleaseBranchesVersionStrategy(IRepositoryStore repositorySt public override IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { - if (Context.Configuration.VersioningMode == VersioningMode.TrunkBased) return []; + if (Context.Configuration.DeploymentMode == DeploymentMode.TrunkBased) return []; return configuration.Value.TracksReleaseBranches ? ReleaseBranchBaseVersions() : []; } diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs index 3d15aa89ca..2052689c57 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs @@ -66,7 +66,7 @@ internal sealed class TrunkBasedVersionStrategy( public override IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { - if (Context.Configuration.VersioningMode != VersioningMode.TrunkBased) yield break; + if (Context.Configuration.DeploymentMode != DeploymentMode.TrunkBased) yield break; var iteration = CreateIteration(branchName: Context.CurrentBranch.Name, configuration: configuration.Value); diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs index e8daea70d1..0c9a1df281 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs @@ -17,7 +17,7 @@ internal class VersionInBranchNameVersionStrategy(IRepositoryStore repositorySto public override IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { - if (Context.Configuration.VersioningMode == VersioningMode.TrunkBased) yield break; + if (Context.Configuration.DeploymentMode == DeploymentMode.TrunkBased) yield break; if (configuration.Value.IsReleaseBranch && TryGetBaseVersion(out var baseVersion, configuration)) {