From 5460bb5f6733cda3e8e4fd3d263df41a15bf0a5e Mon Sep 17 00:00:00 2001 From: HHobeck Date: Mon, 20 May 2024 12:05:00 +0200 Subject: [PATCH] Rename TrunkBased Version Strategy to Mainline --- BREAKING_CHANGES.md | 6 +- docs/input/docs/reference/configuration.md | 2 +- schemas/6.0/GitVersion.configuration.json | 6 +- .../TrunkBasedConfigurationBuilder.cs | 2 +- .../GitVersionConfiguration.cs | 2 +- .../Workflows/TrunkBased/v1.yml | 2 +- ...lignGitFlowWithMainlineVersionStrategy.cs} | 1542 ++++++++--------- ...nGitHubFlowWithMainlineVersionStrategy.cs} | 1542 ++++++++--------- ...singMainlineVersionStrategyWithGitFlow.cs} | 164 +- ...gMainlineVersionStrategyWithGitHubFlow.cs} | 74 +- ...ngTheBehaviorOfDifferentVersioningModes.cs | 71 +- .../DocumentationSamplesForGitFlow.cs | 14 +- .../DocumentationSamplesForGitHubFlow.cs | 6 +- ...ios.cs => MainlineDevelopmentScenarios.cs} | 6 +- .../IntegrationTests/OtherScenarios.cs | 4 +- .../VersionBumpingScenarios.cs | 2 +- ...lopBranchWithOneCommitMergedToMainWhen.cs} | 16 +- ...edToMainWhenMergedCommitTaggedAsStable.cs} | 16 +- ...ergeCommitFromMainMergedBackToMainWhen.cs} | 16 +- ...tureBranchWithAMergeCommitFromMainWhen.cs} | 24 +- ...ranchWithOneCommitBranchedFromMainWhen.cs} | 24 +- ...FromMainWhenCommitAHasBumpMessageMajor.cs} | 56 +- ...FromMainWhenCommitAHasBumpMessageMinor.cs} | 56 +- ...FromMainWhenCommitAHasBumpMessagePatch.cs} | 56 +- ...dFromMainWhenCommitATaggedAsPreRelease.cs} | 24 +- ...omMainWhenCommitATaggedAsPreReleaseBar.cs} | 24 +- ...omMainWhenCommitATaggedAsPreReleaseFoo.cs} | 24 +- ...nchedFromMainWhenCommitATaggedAsStable.cs} | 24 +- ...FromMainWhenCommitBHasBumpMessageMajor.cs} | 56 +- ...FromMainWhenCommitBHasBumpMessageMinor.cs} | 56 +- ...FromMainWhenCommitBHasBumpMessagePatch.cs} | 56 +- ...dFromMainWhenCommitBTaggedAsPreRelease.cs} | 24 +- ...omMainWhenCommitBTaggedAsPreReleaseBar.cs} | 24 +- ...omMainWhenCommitBTaggedAsPreReleaseFoo.cs} | 24 +- ...nchedFromMainWhenCommitBTaggedAsStable.cs} | 40 +- ...ureBranchWithOneCommitMergedToMainWhen.cs} | 40 +- ...gedToMainWhenCommitBTaggedAsPreRelease.cs} | 40 +- ...ToMainWhenCommitBTaggedAsPreReleaseBar.cs} | 40 +- ...ToMainWhenCommitBTaggedAsPreReleaseFoo.cs} | 40 +- ...tMergedToMainWhenCommitBTaggedAsStable.cs} | 40 +- ...MainWithOneCommitBranchedToFeatureWhen.cs} | 40 +- ...w+GivenAFeatureBranchWithOneCommitWhen.cs} | 12 +- ...OneCommitWhenCommitHasBumpMessageMajor.cs} | 20 +- ...OneCommitWhenCommitHasBumpMessageMinor.cs} | 20 +- ...OneCommitWhenCommitHasBumpMessagePatch.cs} | 20 +- ...hOneCommitWhenCommitTaggedAsPreRelease.cs} | 16 +- ...eCommitWhenCommitTaggedAsPreReleaseBar.cs} | 16 +- ...eCommitWhenCommitTaggedAsPreReleaseFoo.cs} | 16 +- ...hWithOneCommitWhenCommitTaggedAsStable.cs} | 16 +- ...chWithThreeCommitsBranchedFromMainWhen.cs} | 20 +- ...BranchWithThreeCommitsMergedToMainWhen.cs} | 40 +- ...ivenAFeatureBranchWithThreeCommitsWhen.cs} | 12 +- ...anchWithTwoCommitsBranchedFromMainWhen.cs} | 20 +- ...reBranchWithTwoCommitsMergedToMainWhen.cs} | 40 +- ...mmitsWhenFirstCommitTaggedAsPreRelease.cs} | 12 +- ...tsWhenFirstCommitTaggedAsPreReleaseBar.cs} | 12 +- ...tsWhenFirstCommitTaggedAsPreReleaseFoo.cs} | 12 +- ...anchWithOneCommitBranchedToFeatureWhen.cs} | 24 +- ...ToFeatureWhenCommitHasBumpMessageMajor.cs} | 56 +- ...ToFeatureWhenCommitHasBumpMessageMinor.cs} | 56 +- ...ToFeatureWhenCommitHasBumpMessagePatch.cs} | 56 +- ...dToFeatureWhenCommitTaggedAsPreRelease.cs} | 40 +- ...FeatureWhenCommitTaggedAsPreReleaseBar.cs} | 40 +- ...FeatureWhenCommitTaggedAsPreReleaseFoo.cs} | 40 +- ...nchedToFeatureWhenCommitTaggedAsStable.cs} | 40 +- ...Flow+GivenAMainBranchWithOneCommitWhen.cs} | 12 +- ...OneCommitWhenCommitHasBumpMessageMajor.cs} | 20 +- ...OneCommitWhenCommitHasBumpMessageMinor.cs} | 20 +- ...OneCommitWhenCommitHasBumpMessagePatch.cs} | 20 +- ...hOneCommitWhenCommitTaggedAsPreRelease.cs} | 12 +- ...eCommitWhenCommitTaggedAsPreReleaseBar.cs} | 12 +- ...eCommitWhenCommitTaggedAsPreReleaseFoo.cs} | 12 +- ...hWithOneCommitWhenCommitTaggedAsStable.cs} | 12 +- ...w+GivenAMainBranchWithThreeCommitsWhen.cs} | 12 +- ...nchWithTwoCommitsBranchedToFeatureWhen.cs} | 24 +- ...tureWhenFirstCommitHasBumpMessageMajor.cs} | 56 +- ...tureWhenFirstCommitHasBumpMessageMinor.cs} | 56 +- ...tureWhenFirstCommitHasBumpMessagePatch.cs} | 56 +- ...atureWhenFirstCommitTaggedAsPreRelease.cs} | 24 +- ...reWhenFirstCommitTaggedAsPreReleaseBar.cs} | 24 +- ...reWhenFirstCommitTaggedAsPreReleaseFoo.cs} | 24 +- ...ToFeatureWhenFirstCommitTaggedAsStable.cs} | 24 +- ...low+GivenAMainBranchWithTwoCommitsWhen.cs} | 12 +- ...mitsWhenFirstCommitHasBumpMessageMajor.cs} | 20 +- ...mitsWhenFirstCommitHasBumpMessageMinor.cs} | 20 +- ...mitsWhenFirstCommitHasBumpMessagePatch.cs} | 20 +- ...mmitsWhenFirstCommitTaggedAsPreRelease.cs} | 12 +- ...tsWhenFirstCommitTaggedAsPreReleaseBar.cs} | 12 +- ...tsWhenFirstCommitTaggedAsPreReleaseFoo.cs} | 12 +- ...woCommitsWhenFirstCommitTaggedAsStable.cs} | 12 +- ...itsWhenSecondCommitHasBumpMessageMajor.cs} | 20 +- ...itsWhenSecondCommitHasBumpMessageMinor.cs} | 20 +- ...itsWhenSecondCommitHasBumpMessagePatch.cs} | 20 +- ...mitsWhenSecondCommitTaggedAsPreRelease.cs} | 12 +- ...sWhenSecondCommitTaggedAsPreReleaseBar.cs} | 12 +- ...sWhenSecondCommitTaggedAsPreReleaseFoo.cs} | 12 +- ...oCommitsWhenSecondCommitTaggedAsStable.cs} | 12 +- src/GitVersion.Core/PublicAPI.Unshipped.txt | 2 +- .../EnrichIncrement.cs | 8 +- .../EnrichSemanticVersion.cs | 6 +- .../Mainline/IContextPostEnricher.cs | 6 + .../Mainline/IContextPreEnricher.cs | 6 + .../Mainline/IIncrementer.cs | 9 + .../MainlineCommit.cs} | 22 +- .../MainlineContext.cs} | 4 +- .../MainlineIteration.cs} | 28 +- .../NonTrunk/CommitOnNonTrunk.cs | 8 +- .../NonTrunk/CommitOnNonTrunkBranchedBase.cs | 8 +- .../CommitOnNonTrunkBranchedToNonTrunk.cs | 4 +- .../CommitOnNonTrunkBranchedToTrunk.cs | 4 +- .../CommitOnNonTrunkWithPreReleaseTag.cs | 4 +- .../CommitOnNonTrunkWithPreReleaseTagBase.cs | 8 +- .../NonTrunk/CommitOnNonTrunkWithStableTag.cs | 4 +- .../CommitOnNonTrunkWithStableTagBase.cs | 8 +- .../NonTrunk/FirstCommitOnRelease.cs | 8 +- .../LastCommitOnNonTrunkWithPreReleaseTag.cs | 6 +- .../LastCommitOnNonTrunkWithStableTag.cs | 6 +- .../NonTrunk/LastMergeCommitOnNonTrunk.cs | 6 +- .../NonTrunk/MergeCommitOnNonTrunk.cs | 4 +- .../NonTrunk/MergeCommitOnNonTrunkBase.cs | 10 +- .../RemoveIncrement.cs | 6 +- .../Mainline/RemoveSemanticVersion.cs | 6 + .../Trunk/CommitOnTrunk.cs | 8 +- .../Trunk/CommitOnTrunkBranchedBase.cs | 8 +- .../Trunk/CommitOnTrunkBranchedToNonTrunk.cs | 4 +- .../Trunk/CommitOnTrunkBranchedToTrunk.cs | 4 +- .../Trunk/CommitOnTrunkWithPreReleaseTag.cs | 4 +- .../CommitOnTrunkWithPreReleaseTagBase.cs | 8 +- .../Trunk/CommitOnTrunkWithStableTag.cs | 4 +- .../Trunk/CommitOnTrunkWithStableTagBase.cs | 8 +- .../LastCommitOnTrunkWithPreReleaseTag.cs | 6 +- .../Trunk/LastCommitOnTrunkWithStableTag.cs | 6 +- .../Trunk/LastMergeCommitOnTrunk.cs | 4 +- .../Trunk/MergeCommitOnTrunk.cs | 4 +- .../Trunk/MergeCommitOnTrunkBase.cs | 10 +- .../ITrunkBasedContextPostEnricher.cs | 6 - .../ITrunkBasedContextPreEnricher.cs | 6 - .../TrunkBased/ITrunkBasedIncrementer.cs | 9 - .../TrunkBased/RemoveSemanticVersion.cs | 6 - ...Strategy.cs => MainlineVersionStrategy.cs} | 32 +- .../VersionCalculation/VersionStrategies.cs | 2 +- 141 files changed, 2956 insertions(+), 3003 deletions(-) rename src/GitVersion.Core.Tests/IntegrationTests/{AlignGitFlowWithTrunkBasedVersionStrategy.cs => AlignGitFlowWithMainlineVersionStrategy.cs} (91%) rename src/GitVersion.Core.Tests/IntegrationTests/{AlignGitHubFlowWithTrunkBasedVersionStrategy.cs => AlignGitHubFlowWithMainlineVersionStrategy.cs} (91%) rename src/GitVersion.Core.Tests/IntegrationTests/{CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow.cs => CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs} (90%) rename src/GitVersion.Core.Tests/IntegrationTests/{CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow.cs => CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs} (88%) rename src/GitVersion.Core.Tests/IntegrationTests/{TrunkBasedDevelopmentScenarios.cs => MainlineDevelopmentScenarios.cs} (99%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs => Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs} (90%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs} (90%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs} (97%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs} (93%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs} (88%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs} (88%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs} (88%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs} (87%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs} (97%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs} (97%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs} (98%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs} (84%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs} (89%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs} (85%) rename src/GitVersion.Core.Tests/{TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs => Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs} (84%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/EnrichIncrement.cs (86%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/EnrichSemanticVersion.cs (76%) create mode 100644 src/GitVersion.Core/VersionCalculation/Mainline/IContextPostEnricher.cs create mode 100644 src/GitVersion.Core/VersionCalculation/Mainline/IContextPreEnricher.cs create mode 100644 src/GitVersion.Core/VersionCalculation/Mainline/IIncrementer.cs rename src/GitVersion.Core/VersionCalculation/{TrunkBased/TrunkBasedCommit.cs => Mainline/MainlineCommit.cs} (81%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased/TrunkBasedContext.cs => Mainline/MainlineContext.cs} (78%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased/TrunkBasedIteration.cs => Mainline/MainlineIteration.cs} (70%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunk.cs (80%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkBranchedBase.cs (78%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs (74%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs (74%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs (60%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs (76%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkWithStableTag.cs (59%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs (71%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/FirstCommitOnRelease.cs (80%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs (75%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs (75%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/LastMergeCommitOnNonTrunk.cs (76%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/MergeCommitOnNonTrunk.cs (61%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/NonTrunk/MergeCommitOnNonTrunkBase.cs (82%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/RemoveIncrement.cs (53%) create mode 100644 src/GitVersion.Core/VersionCalculation/Mainline/RemoveSemanticVersion.cs rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunk.cs (78%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkBranchedBase.cs (82%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkBranchedToNonTrunk.cs (74%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkBranchedToTrunk.cs (74%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkWithPreReleaseTag.cs (59%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs (61%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkWithStableTag.cs (59%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/CommitOnTrunkWithStableTagBase.cs (69%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs (83%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/LastCommitOnTrunkWithStableTag.cs (79%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/LastMergeCommitOnTrunk.cs (59%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/MergeCommitOnTrunk.cs (61%) rename src/GitVersion.Core/VersionCalculation/{TrunkBased => Mainline}/Trunk/MergeCommitOnTrunkBase.cs (85%) delete mode 100644 src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPostEnricher.cs delete mode 100644 src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPreEnricher.cs delete mode 100644 src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedIncrementer.cs delete mode 100644 src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveSemanticVersion.cs rename src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/{TrunkBasedVersionStrategy.cs => MainlineVersionStrategy.cs} (92%) diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md index 8e8b31dd34..807a5698e0 100644 --- a/BREAKING_CHANGES.md +++ b/BREAKING_CHANGES.md @@ -39,8 +39,8 @@ * The `BranchPrefixToTrim` configuration property has been removed. `RegularExpression` is now used to capture named groups instead. * 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 `Mainline` mode and the related implementation has been removed completely. The new `TrunkBased` version strategy should be used instead. -* The `TrunkBased` workflow doesn't support downgrading the increment for calculating the next version. This is the case if e.g. a bump messages has been defined which is lower than the branch increment. +* The `Mainline` mode and the related implementation has been removed completely. The new `Mainline` version strategy should be used instead. +* The `Mainline` version strategy doesn't support downgrading the increment for calculating the next version. This is the case if e.g. a bump messages has been defined which is lower than the branch increment. * 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) @@ -52,7 +52,7 @@ * TaggedCommit * TrackReleaseBranches * VersionInBranchName - * TrunkBased + * Mainline * The initialization wizard has been removed. * On the `develop`, `release` and `hotfix` branch the introduced branch related property `prevent-increment.when-current-commit-tagged` has been set to `false` to get the incremented instead of the tagged semantic version. * When setting the "ignore commits before" parameter to a future value, an exception will occur if no commits are found on the current branch. This behavior mimics that of an empty repository. diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md index 536c5a1299..7cf48b6975 100644 --- a/docs/input/docs/reference/configuration.md +++ b/docs/input/docs/reference/configuration.md @@ -38,7 +38,7 @@ The following supported workflow configurations are available in GitVersion and - GitFlow (GitFlow/v1) - GitHubFlow (GitHubFlow/v1) -Example of using a `TrunkBased` workflow with a different `tag-prefix`: +Example of using a `GitHubFlow` workflow with a different `tag-prefix`: ```yaml workflow: GitHubFlow/v1 diff --git a/schemas/6.0/GitVersion.configuration.json b/schemas/6.0/GitVersion.configuration.json index ea2cc03003..3f8e0f3290 100644 --- a/schemas/6.0/GitVersion.configuration.json +++ b/schemas/6.0/GitVersion.configuration.json @@ -177,10 +177,10 @@ "type": "string" }, "strategies": { - "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.", + "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'Mainline'.", "type": "array", "items": { - "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.", + "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'Mainline'.", "enum": [ "None", "Fallback", @@ -189,7 +189,7 @@ "TaggedCommit", "TrackReleaseBranches", "VersionInBranchName", - "TrunkBased" + "Mainline" ] } }, diff --git a/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs index 6ac109ccdb..c6e5047b67 100644 --- a/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs @@ -20,7 +20,7 @@ private TrunkBasedConfigurationBuilder() SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat, VersionStrategies = [ VersionStrategies.ConfiguredNextVersion, - VersionStrategies.TrunkBased + VersionStrategies.Mainline ], TagPrefix = ConfigurationConstants.DefaultTagPrefix, VersionInBranchPattern = ConfigurationConstants.DefaultVersionInBranchPattern, diff --git a/src/GitVersion.Configuration/GitVersionConfiguration.cs b/src/GitVersion.Configuration/GitVersionConfiguration.cs index c0823eecc6..1c2360d3a7 100644 --- a/src/GitVersion.Configuration/GitVersionConfiguration.cs +++ b/src/GitVersion.Configuration/GitVersionConfiguration.cs @@ -129,7 +129,7 @@ public string? NextVersion ? VersionCalculation.VersionStrategies.None : VersionStrategies.Aggregate((one, another) => one | another); [JsonPropertyName("strategies")] - [JsonPropertyDescription($"Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.")] + [JsonPropertyDescription($"Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'Mainline'.")] public VersionStrategies[] VersionStrategies { get; internal set; } = []; [JsonIgnore] diff --git a/src/GitVersion.Configuration/Workflows/TrunkBased/v1.yml b/src/GitVersion.Configuration/Workflows/TrunkBased/v1.yml index 07f190c332..cc9b59a1dd 100644 --- a/src/GitVersion.Configuration/Workflows/TrunkBased/v1.yml +++ b/src/GitVersion.Configuration/Workflows/TrunkBased/v1.yml @@ -12,7 +12,7 @@ merge-message-formats: {} update-build-number: true semantic-version-format: Strict strategies: -- TrunkBased +- Mainline - ConfiguredNextVersion branches: main: diff --git a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithTrunkBasedVersionStrategy.cs b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs similarity index 91% rename from src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithTrunkBasedVersionStrategy.cs rename to src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs index fb568691dd..3eb66847eb 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithTrunkBasedVersionStrategy.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs @@ -5,7 +5,7 @@ namespace GitVersion.Core.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] -public class AlignGitFlowWithTrunkBasedVersionStrategy +public class AlignGitFlowWithMainlineVersionStrategy { private static GitFlowConfigurationBuilder configurationBuilder => GitFlowConfigurationBuilder.New; @@ -14,10 +14,10 @@ public class AlignGitFlowWithTrunkBasedVersionStrategy /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -35,13 +35,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -78,10 +78,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -99,13 +99,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -133,7 +133,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+4", configuration); @@ -150,10 +150,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -171,13 +171,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -205,7 +205,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+4", configuration); @@ -222,10 +222,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -243,13 +243,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -277,7 +277,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+4", configuration); @@ -294,10 +294,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -315,13 +315,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -358,10 +358,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -379,7 +379,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -407,7 +407,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+4", configuration); @@ -424,10 +424,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -445,7 +445,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -473,7 +473,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+4", configuration); @@ -490,10 +490,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -511,7 +511,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -548,10 +548,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -569,7 +569,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -606,10 +606,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -627,7 +627,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -664,10 +664,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -685,13 +685,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -728,10 +728,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -749,13 +749,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -783,7 +783,7 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+4", configuration); @@ -800,10 +800,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -821,13 +821,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -864,10 +864,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -885,13 +885,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -928,10 +928,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -949,13 +949,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -992,10 +992,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1013,13 +1013,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1056,10 +1056,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1077,13 +1077,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1111,7 +1111,7 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+4", configuration); @@ -1128,10 +1128,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1149,13 +1149,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1183,7 +1183,7 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+4", configuration); @@ -1200,10 +1200,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1221,13 +1221,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1264,10 +1264,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1285,13 +1285,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1328,10 +1328,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1349,13 +1349,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1392,10 +1392,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1413,13 +1413,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1447,7 +1447,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+4", configuration); @@ -1464,10 +1464,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1485,13 +1485,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1519,7 +1519,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+4", configuration); @@ -1536,10 +1536,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1557,13 +1557,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1591,7 +1591,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+4", configuration); @@ -1608,10 +1608,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1629,13 +1629,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1672,10 +1672,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1693,7 +1693,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1710,7 +1710,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1747,10 +1747,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1768,7 +1768,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1785,7 +1785,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1813,7 +1813,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -1830,10 +1830,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1851,7 +1851,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1868,7 +1868,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1896,7 +1896,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -1913,10 +1913,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1934,7 +1934,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1951,7 +1951,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1979,7 +1979,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -1996,10 +1996,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2017,7 +2017,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2034,7 +2034,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2071,10 +2071,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2092,7 +2092,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2106,7 +2106,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2117,7 +2117,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -2149,7 +2149,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -2166,10 +2166,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2187,7 +2187,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2201,7 +2201,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2212,7 +2212,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -2244,7 +2244,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -2261,10 +2261,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2282,7 +2282,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2296,7 +2296,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2307,10 +2307,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-foo.1+2", configuration); @@ -2323,7 +2323,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.MakeACommit("D"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-foo.1+3", configuration); @@ -2360,10 +2360,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2381,7 +2381,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2395,7 +2395,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2406,7 +2406,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2443,10 +2443,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2464,7 +2464,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2478,7 +2478,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2489,7 +2489,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2526,10 +2526,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2547,7 +2547,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2564,7 +2564,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2601,10 +2601,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2622,7 +2622,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2639,7 +2639,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2667,7 +2667,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+6", configuration); @@ -2684,10 +2684,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2705,7 +2705,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2722,7 +2722,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2759,10 +2759,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2780,7 +2780,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2797,7 +2797,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2834,10 +2834,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2855,7 +2855,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2872,7 +2872,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2909,10 +2909,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2930,7 +2930,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2947,7 +2947,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2984,10 +2984,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3005,7 +3005,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3022,7 +3022,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3050,7 +3050,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+6", configuration); @@ -3067,10 +3067,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3088,7 +3088,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3105,7 +3105,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3133,7 +3133,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+6", configuration); @@ -3150,10 +3150,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3171,7 +3171,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3188,7 +3188,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3225,10 +3225,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3246,7 +3246,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3263,7 +3263,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3300,10 +3300,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3321,7 +3321,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3338,7 +3338,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3375,10 +3375,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3396,7 +3396,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3413,7 +3413,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3441,7 +3441,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -3458,10 +3458,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3479,7 +3479,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3496,7 +3496,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3524,7 +3524,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -3541,10 +3541,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3562,7 +3562,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3579,7 +3579,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3607,7 +3607,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -3624,10 +3624,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3645,7 +3645,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3662,7 +3662,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3699,10 +3699,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3720,7 +3720,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3751,10 +3751,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3772,7 +3772,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3787,7 +3787,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-PullRequest2.2", configuration); @@ -3802,7 +3802,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+2", configuration); @@ -3819,10 +3819,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3840,7 +3840,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3855,7 +3855,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-PullRequest2.2", configuration); @@ -3870,7 +3870,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+2", configuration); @@ -3887,10 +3887,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3908,7 +3908,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3923,7 +3923,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-PullRequest2.2", configuration); @@ -3938,7 +3938,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+2", configuration); @@ -3955,10 +3955,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3976,7 +3976,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4007,10 +4007,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4028,7 +4028,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4050,7 +4050,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+2", configuration); @@ -4067,10 +4067,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4088,7 +4088,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4110,7 +4110,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+2", configuration); @@ -4127,10 +4127,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4148,7 +4148,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4170,7 +4170,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+2", configuration); @@ -4187,10 +4187,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4208,7 +4208,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4230,7 +4230,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+2", configuration); @@ -4247,10 +4247,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4268,7 +4268,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4290,7 +4290,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4307,10 +4307,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4328,7 +4328,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4359,10 +4359,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4380,7 +4380,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4395,7 +4395,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-PullRequest2.2", configuration); @@ -4410,7 +4410,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+2", configuration); @@ -4427,10 +4427,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4448,7 +4448,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4479,10 +4479,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4500,7 +4500,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4522,7 +4522,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+2", configuration); @@ -4539,10 +4539,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4560,7 +4560,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4582,7 +4582,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4599,10 +4599,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4620,7 +4620,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4651,10 +4651,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4672,7 +4672,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4687,7 +4687,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-PullRequest2.2", configuration); @@ -4702,7 +4702,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+2", configuration); @@ -4719,10 +4719,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4740,7 +4740,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4755,7 +4755,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-PullRequest2.2", configuration); @@ -4770,7 +4770,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-1+2", configuration); @@ -4787,10 +4787,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4808,7 +4808,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4839,10 +4839,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4860,7 +4860,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4882,7 +4882,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4899,10 +4899,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4920,7 +4920,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4951,10 +4951,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4972,7 +4972,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4987,7 +4987,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-PullRequest2.2", configuration); @@ -5002,7 +5002,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+2", configuration); @@ -5019,10 +5019,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5040,7 +5040,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5055,7 +5055,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-PullRequest2.2", configuration); @@ -5070,7 +5070,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+2", configuration); @@ -5087,10 +5087,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5108,7 +5108,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5123,7 +5123,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-PullRequest2.2", configuration); @@ -5138,7 +5138,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+2", configuration); @@ -5155,10 +5155,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5176,7 +5176,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5215,10 +5215,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(boo [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5237,7 +5237,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/3.0.0"); // ✅ succeeds as expected @@ -5254,7 +5254,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("release/3.0.0"); // ✅ succeeds as expected @@ -5285,7 +5285,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5309,10 +5309,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5331,7 +5331,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5348,7 +5348,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5379,7 +5379,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5399,10 +5399,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran [TestCase(true, "release/0.1.0")] [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5421,7 +5421,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5438,7 +5438,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5466,7 +5466,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -5477,7 +5477,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("2.0.0"); fixture.ApplyTag("2.0.0"); @@ -5503,10 +5503,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( [TestCase(true, "release/1.0.0")] [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5525,7 +5525,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5542,7 +5542,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5570,7 +5570,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -5581,7 +5581,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.0.1"); + if (!useMainline) fixture.ApplyTag("2.0.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5605,10 +5605,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5627,7 +5627,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5644,7 +5644,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5672,7 +5672,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -5683,7 +5683,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.1.0"); + if (!useMainline) fixture.ApplyTag("2.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5707,10 +5707,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5729,7 +5729,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5746,7 +5746,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5777,7 +5777,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5797,10 +5797,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5819,7 +5819,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -5833,7 +5833,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -5844,7 +5844,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -5879,10 +5879,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+1", configuration); @@ -5901,10 +5901,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5923,7 +5923,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5937,7 +5937,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -5948,7 +5948,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -5980,7 +5980,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -5991,14 +5991,14 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-4+1", configuration); @@ -6017,10 +6017,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6039,7 +6039,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6053,7 +6053,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6064,7 +6064,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6096,7 +6096,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -6107,14 +6107,14 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-4+1", configuration); @@ -6133,10 +6133,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6155,7 +6155,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6169,7 +6169,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6180,7 +6180,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6215,10 +6215,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+1", configuration); @@ -6237,10 +6237,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6259,7 +6259,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6273,7 +6273,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6284,7 +6284,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6319,10 +6319,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+1", configuration); @@ -6341,10 +6341,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6363,7 +6363,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6377,7 +6377,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6388,7 +6388,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6423,10 +6423,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+1", configuration); @@ -6451,10 +6451,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6473,7 +6473,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -6490,7 +6490,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -6521,7 +6521,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6539,10 +6539,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6561,7 +6561,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6578,7 +6578,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6609,7 +6609,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.3-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.3"); + if (!useMainline) fixture.ApplyTag("0.0.3"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6625,10 +6625,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6647,7 +6647,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6664,7 +6664,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6692,7 +6692,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+6", configuration); @@ -6703,7 +6703,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("0.0.3-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.2"); fixture.ApplyTag("0.0.2"); @@ -6725,10 +6725,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6747,7 +6747,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6764,7 +6764,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6795,7 +6795,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.3-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.3"); + if (!useMainline) fixture.ApplyTag("0.0.3"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6811,10 +6811,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6833,7 +6833,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6850,7 +6850,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6881,7 +6881,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6897,10 +6897,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6919,7 +6919,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6936,7 +6936,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6967,7 +6967,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6987,10 +6987,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7009,7 +7009,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -7026,7 +7026,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -7057,7 +7057,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7075,10 +7075,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7097,7 +7097,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7114,7 +7114,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7145,7 +7145,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.3.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.3.0"); + if (!useMainline) fixture.ApplyTag("0.3.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7163,10 +7163,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.1.0")] [TestCase(true, "release/0.1.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7185,7 +7185,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7202,7 +7202,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7230,7 +7230,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+6", configuration); @@ -7241,7 +7241,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("0.3.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.2.0"); fixture.ApplyTag("0.2.0"); @@ -7263,10 +7263,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7285,7 +7285,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7302,7 +7302,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7330,7 +7330,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+6", configuration); @@ -7341,7 +7341,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b fixture.AssertFullSemver("0.3.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.2.1"); + if (!useMainline) fixture.ApplyTag("0.2.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7359,10 +7359,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7381,7 +7381,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7398,7 +7398,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7429,7 +7429,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.3.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.3.0"); + if (!useMainline) fixture.ApplyTag("0.3.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7449,10 +7449,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/0.1.0")] [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7471,7 +7471,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7488,7 +7488,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7519,7 +7519,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7539,10 +7539,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7561,7 +7561,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/3.0.0"); // ✅ succeeds as expected @@ -7578,7 +7578,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("release/3.0.0"); // ✅ succeeds as expected @@ -7609,7 +7609,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7633,10 +7633,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr [TestCase(true, "release/1.1.0")] [TestCase(false, "release/1.1.1")] [TestCase(true, "release/1.1.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7655,7 +7655,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7672,7 +7672,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7703,7 +7703,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7721,10 +7721,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.1")] [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7743,7 +7743,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7760,7 +7760,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7788,7 +7788,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -7799,7 +7799,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("2.0.0"); fixture.ApplyTag("2.0.0"); @@ -7823,10 +7823,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/1.0.0")] [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7845,7 +7845,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7862,7 +7862,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7890,7 +7890,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -7901,7 +7901,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.0.1"); + if (!useMainline) fixture.ApplyTag("2.0.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7923,10 +7923,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7945,7 +7945,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7962,7 +7962,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7990,7 +7990,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -8001,7 +8001,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.1.0"); + if (!useMainline) fixture.ApplyTag("2.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -8029,10 +8029,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/1.1.0")] [TestCase(false, "release/1.1.1")] [TestCase(true, "release/1.1.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8051,7 +8051,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8068,7 +8068,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -8099,7 +8099,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -8116,10 +8116,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8141,7 +8141,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -8195,7 +8195,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8221,10 +8221,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8246,7 +8246,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8300,7 +8300,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8324,10 +8324,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8349,7 +8349,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8400,7 +8400,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+6", configuration); @@ -8411,7 +8411,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("1.0.0"); fixture.ApplyTag("1.0.0"); @@ -8441,10 +8441,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8466,7 +8466,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8517,7 +8517,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+6", configuration); @@ -8528,7 +8528,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.0.1"); + if (!useMainline) fixture.ApplyTag("1.0.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8558,10 +8558,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8583,7 +8583,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8634,7 +8634,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+6", configuration); @@ -8645,7 +8645,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.1.0"); + if (!useMainline) fixture.ApplyTag("1.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8679,10 +8679,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel [TestCase(false, "release/2.0.0")] [TestCase(true, "release/2.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8704,7 +8704,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8758,7 +8758,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8775,10 +8775,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8800,7 +8800,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -8854,10 +8854,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+1", configuration); @@ -8874,10 +8874,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8899,7 +8899,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8950,7 +8950,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+6", configuration); @@ -8961,14 +8961,14 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+1", configuration); @@ -8985,10 +8985,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9010,7 +9010,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9061,7 +9061,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+6", configuration); @@ -9072,14 +9072,14 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+1", configuration); @@ -9097,10 +9097,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease [TestCase(true, "release/0.0.0")] [TestCase(true, "release/0.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9122,7 +9122,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9176,10 +9176,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+1", configuration); @@ -9199,10 +9199,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas [TestCase(true, "release/0.0.2")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9224,7 +9224,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9278,10 +9278,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+1", configuration); @@ -9304,10 +9304,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas [TestCase(true, "release/0.2.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9329,7 +9329,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9383,10 +9383,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+1", configuration); @@ -9408,10 +9408,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9433,7 +9433,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -9487,7 +9487,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9503,10 +9503,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9528,7 +9528,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9582,7 +9582,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9596,10 +9596,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9621,7 +9621,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9672,7 +9672,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+6", configuration); @@ -9683,7 +9683,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas fixture.AssertFullSemver("0.0.2-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.1"); fixture.ApplyTag("0.0.1"); @@ -9703,10 +9703,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9728,7 +9728,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9782,7 +9782,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9797,10 +9797,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea [TestCase(true, "release/0.0.1")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9822,7 +9822,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9876,7 +9876,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9895,10 +9895,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea [TestCase(true, "release/0.1.1")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9920,7 +9920,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9974,7 +9974,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9991,10 +9991,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10016,7 +10016,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -10070,7 +10070,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10092,10 +10092,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10117,7 +10117,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10171,7 +10171,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10189,10 +10189,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel [TestCase(false, "release/0.1.0")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10214,7 +10214,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10265,7 +10265,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+6", configuration); @@ -10276,7 +10276,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas fixture.AssertFullSemver("0.2.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.1.0"); fixture.ApplyTag("0.1.0"); @@ -10300,10 +10300,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10325,7 +10325,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10376,7 +10376,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-1+6", configuration); @@ -10387,7 +10387,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea fixture.AssertFullSemver("0.2.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.1.1"); + if (!useMainline) fixture.ApplyTag("0.1.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10409,10 +10409,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10434,7 +10434,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10488,7 +10488,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10510,10 +10510,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10535,7 +10535,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10589,7 +10589,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10606,10 +10606,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10631,7 +10631,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -10685,7 +10685,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10711,10 +10711,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10736,7 +10736,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10790,7 +10790,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10814,10 +10814,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10839,7 +10839,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10890,7 +10890,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+6", configuration); @@ -10901,7 +10901,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("1.0.0"); fixture.ApplyTag("1.0.0"); @@ -10931,10 +10931,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10956,7 +10956,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11007,7 +11007,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+6", configuration); @@ -11018,7 +11018,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.0.1"); + if (!useMainline) fixture.ApplyTag("1.0.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -11048,10 +11048,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -11073,7 +11073,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11124,7 +11124,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+6", configuration); @@ -11135,7 +11135,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.1.0"); + if (!useMainline) fixture.ApplyTag("1.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -11169,10 +11169,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea [TestCase(false, "release/2.0.0")] [TestCase(true, "release/2.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -11194,7 +11194,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11248,7 +11248,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected diff --git a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithTrunkBasedVersionStrategy.cs b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs similarity index 91% rename from src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithTrunkBasedVersionStrategy.cs rename to src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs index 742250c376..ea81aaf68e 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithTrunkBasedVersionStrategy.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs @@ -5,7 +5,7 @@ namespace GitVersion.Core.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] -public class AlignGitHubFlowWithTrunkBasedVersionStrategy +public class AlignGitHubFlowWithMainlineVersionStrategy { private static GitHubFlowConfigurationBuilder configurationBuilder => GitHubFlowConfigurationBuilder.New; @@ -14,10 +14,10 @@ public class AlignGitHubFlowWithTrunkBasedVersionStrategy /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -35,13 +35,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -78,10 +78,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -99,13 +99,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -133,7 +133,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+4", configuration); @@ -150,10 +150,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool u /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -171,13 +171,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -205,7 +205,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+4", configuration); @@ -222,10 +222,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -243,13 +243,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -277,7 +277,7 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+4", configuration); @@ -294,10 +294,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -315,13 +315,13 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -358,10 +358,10 @@ public void EnsureFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -379,7 +379,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -407,7 +407,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+4", configuration); @@ -424,10 +424,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool u /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -445,7 +445,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -473,7 +473,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+4", configuration); @@ -490,10 +490,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useT /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -511,7 +511,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -548,10 +548,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -569,7 +569,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -606,10 +606,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -627,7 +627,7 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -664,10 +664,10 @@ public void EnsureFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -685,13 +685,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -728,10 +728,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -749,13 +749,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -783,7 +783,7 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+4", configuration); @@ -800,10 +800,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -821,13 +821,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -864,10 +864,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -885,13 +885,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -928,10 +928,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -949,13 +949,13 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -992,10 +992,10 @@ public void EnsureFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1013,13 +1013,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1056,10 +1056,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1077,13 +1077,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1111,7 +1111,7 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+4", configuration); @@ -1128,10 +1128,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1149,13 +1149,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1183,7 +1183,7 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+4", configuration); @@ -1200,10 +1200,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1221,13 +1221,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1264,10 +1264,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1285,13 +1285,13 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1328,10 +1328,10 @@ public void EnsureFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1349,13 +1349,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1392,10 +1392,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1413,13 +1413,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1447,7 +1447,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+4", configuration); @@ -1464,10 +1464,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool use /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1485,13 +1485,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1519,7 +1519,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+4", configuration); @@ -1536,10 +1536,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1557,13 +1557,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1591,7 +1591,7 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+4", configuration); @@ -1608,10 +1608,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1629,13 +1629,13 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool us // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1672,10 +1672,10 @@ public void EnsureFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool us /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1693,7 +1693,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1710,7 +1710,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1747,10 +1747,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndInheritOnFeatur /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1768,7 +1768,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1785,7 +1785,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1813,7 +1813,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -1830,10 +1830,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndNoneOnFeatureBr /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1851,7 +1851,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1868,7 +1868,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1896,7 +1896,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -1913,10 +1913,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndPatchOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -1934,7 +1934,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -1951,7 +1951,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -1979,7 +1979,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -1996,10 +1996,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMinorOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2017,7 +2017,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2034,7 +2034,7 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2071,10 +2071,10 @@ public void EnsureMergeMainToFeatureWithIncrementInheritOnMainAndMajorOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2092,7 +2092,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2106,7 +2106,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2117,7 +2117,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -2149,7 +2149,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -2166,10 +2166,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndInheritOnFeatureBr /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2187,7 +2187,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2201,7 +2201,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2212,7 +2212,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -2244,7 +2244,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -2261,10 +2261,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndNoneOnFeatureBranc /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2282,7 +2282,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2296,7 +2296,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2307,10 +2307,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-foo.1+2", configuration); @@ -2323,7 +2323,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran fixture.MakeACommit("D"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-foo.1+3", configuration); @@ -2360,10 +2360,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndPatchOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2381,7 +2381,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2395,7 +2395,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2406,7 +2406,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2443,10 +2443,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMinorOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2464,7 +2464,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2478,7 +2478,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -2489,7 +2489,7 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2526,10 +2526,10 @@ public void EnsureMergeMainToFeatureWithIncrementNoneOnMainAndMajorOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2547,7 +2547,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2564,7 +2564,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2601,10 +2601,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2622,7 +2622,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2639,7 +2639,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2667,7 +2667,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+6", configuration); @@ -2684,10 +2684,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2705,7 +2705,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2722,7 +2722,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2759,10 +2759,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2780,7 +2780,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2797,7 +2797,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2834,10 +2834,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2855,7 +2855,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2872,7 +2872,7 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2909,10 +2909,10 @@ public void EnsureMergeMainToFeatureWithIncrementPatchOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -2930,7 +2930,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -2947,7 +2947,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -2984,10 +2984,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3005,7 +3005,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3022,7 +3022,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3050,7 +3050,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+6", configuration); @@ -3067,10 +3067,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3088,7 +3088,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3105,7 +3105,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3133,7 +3133,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+6", configuration); @@ -3150,10 +3150,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3171,7 +3171,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3188,7 +3188,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3225,10 +3225,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3246,7 +3246,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3263,7 +3263,7 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3300,10 +3300,10 @@ public void EnsureMergeMainToFeatureWithIncrementMinorOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3321,7 +3321,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3338,7 +3338,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3375,10 +3375,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndInheritOnFeatureB /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3396,7 +3396,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3413,7 +3413,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3441,7 +3441,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -3458,10 +3458,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndNoneOnFeatureBran /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3479,7 +3479,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3496,7 +3496,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3524,7 +3524,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -3541,10 +3541,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndPatchOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3562,7 +3562,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3579,7 +3579,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3607,7 +3607,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra fixture.MergeTo("main"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -3624,10 +3624,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMinorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3645,7 +3645,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3662,7 +3662,7 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -3699,10 +3699,10 @@ public void EnsureMergeMainToFeatureWithIncrementMajorOnMainAndMajorOnFeatureBra /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3720,7 +3720,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3751,10 +3751,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndInheritOnFeatureBranch /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3772,7 +3772,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3787,7 +3787,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-PullRequest2.2", configuration); @@ -3802,7 +3802,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+2", configuration); @@ -3819,10 +3819,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndNoneOnFeatureBranch(bo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3840,7 +3840,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3855,7 +3855,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-PullRequest2.2", configuration); @@ -3870,7 +3870,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+2", configuration); @@ -3887,10 +3887,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndPatchOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3908,7 +3908,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -3923,7 +3923,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-PullRequest2.2", configuration); @@ -3938,7 +3938,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+2", configuration); @@ -3955,10 +3955,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMinorOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -3976,7 +3976,7 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4007,10 +4007,10 @@ public void EnsurePullRequestWithIncrementInheritOnMainAndMajorOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4028,7 +4028,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4050,7 +4050,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+2", configuration); @@ -4067,10 +4067,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndInheritOnFeatureBranch(bo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4088,7 +4088,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4110,7 +4110,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+2", configuration); @@ -4127,10 +4127,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4148,7 +4148,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4170,7 +4170,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+2", configuration); @@ -4187,10 +4187,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndPatchOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4208,7 +4208,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4230,7 +4230,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+2", configuration); @@ -4247,10 +4247,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMinorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4268,7 +4268,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4290,7 +4290,7 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4307,10 +4307,10 @@ public void EnsurePullRequestWithIncrementNoneOnMainAndMajorOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4328,7 +4328,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4359,10 +4359,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4380,7 +4380,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4395,7 +4395,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-PullRequest2.2", configuration); @@ -4410,7 +4410,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+2", configuration); @@ -4427,10 +4427,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4448,7 +4448,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4479,10 +4479,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4500,7 +4500,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4522,7 +4522,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+2", configuration); @@ -4539,10 +4539,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4560,7 +4560,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4582,7 +4582,7 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4599,10 +4599,10 @@ public void EnsurePullRequestWithIncrementPatchOnMainAndMajorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4620,7 +4620,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4651,10 +4651,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4672,7 +4672,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4687,7 +4687,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-PullRequest2.2", configuration); @@ -4702,7 +4702,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+2", configuration); @@ -4719,10 +4719,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4740,7 +4740,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4755,7 +4755,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-PullRequest2.2", configuration); @@ -4770,7 +4770,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-1+2", configuration); @@ -4787,10 +4787,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4808,7 +4808,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4839,10 +4839,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4860,7 +4860,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4882,7 +4882,7 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+2", configuration); @@ -4899,10 +4899,10 @@ public void EnsurePullRequestWithIncrementMinorOnMainAndMajorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4920,7 +4920,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4951,10 +4951,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndInheritOnFeatureBranch(b /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -4972,7 +4972,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -4987,7 +4987,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-PullRequest2.2", configuration); @@ -5002,7 +5002,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+2", configuration); @@ -5019,10 +5019,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndNoneOnFeatureBranch(bool /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5040,7 +5040,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5055,7 +5055,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-PullRequest2.2", configuration); @@ -5070,7 +5070,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+2", configuration); @@ -5087,10 +5087,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndPatchOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5108,7 +5108,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5123,7 +5123,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo fixture.BranchTo("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-PullRequest2.2", configuration); @@ -5138,7 +5138,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo fixture.Remove("pull/2/merge"); fixture.MergeNoFF("feature/foo"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+2", configuration); @@ -5155,10 +5155,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch(boo /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useTrunkBased) + public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5176,7 +5176,7 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -5215,10 +5215,10 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMajorOnFeatureBranch(boo [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5237,7 +5237,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/3.0.0"); // ✅ succeeds as expected @@ -5254,7 +5254,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("release/3.0.0"); // ✅ succeeds as expected @@ -5285,7 +5285,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5309,10 +5309,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMain(bool useTrunkBased, In [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5331,7 +5331,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5348,7 +5348,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5379,7 +5379,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5399,10 +5399,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndInheritOnReleaseBran [TestCase(true, "release/0.1.0")] [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5421,7 +5421,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5438,7 +5438,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5466,7 +5466,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -5477,7 +5477,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("2.0.0"); fixture.ApplyTag("2.0.0"); @@ -5503,10 +5503,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( [TestCase(true, "release/1.0.0")] [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5525,7 +5525,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5542,7 +5542,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5570,7 +5570,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -5581,7 +5581,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.0.1"); + if (!useMainline) fixture.ApplyTag("2.0.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5605,10 +5605,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5627,7 +5627,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5644,7 +5644,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5672,7 +5672,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -5683,7 +5683,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.1.0"); + if (!useMainline) fixture.ApplyTag("2.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5707,10 +5707,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5729,7 +5729,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5746,7 +5746,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -5777,7 +5777,7 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -5797,10 +5797,10 @@ public void EnsureReleaseBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5819,7 +5819,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -5833,7 +5833,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -5844,7 +5844,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -5879,10 +5879,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+1", configuration); @@ -5901,10 +5901,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMain(bool useTrunkBased, Incre [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -5923,7 +5923,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -5937,7 +5937,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -5948,7 +5948,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -5980,7 +5980,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -5991,14 +5991,14 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-4+1", configuration); @@ -6017,10 +6017,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6039,7 +6039,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6053,7 +6053,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6064,7 +6064,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6096,7 +6096,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+6", configuration); @@ -6107,14 +6107,14 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-4+1", configuration); @@ -6133,10 +6133,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch(boo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6155,7 +6155,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6169,7 +6169,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6180,7 +6180,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6215,10 +6215,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+1", configuration); @@ -6237,10 +6237,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch(bo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6259,7 +6259,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6273,7 +6273,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6284,7 +6284,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6319,10 +6319,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+1", configuration); @@ -6341,10 +6341,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch(bo [TestCase(true, "release/next")] [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] - public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6363,7 +6363,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6377,7 +6377,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo fixture.Checkout("main"); fixture.MakeACommit("C"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+1", configuration); @@ -6388,7 +6388,7 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo fixture.AssertFullSemver("0.0.0-1+1", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); @@ -6423,10 +6423,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+1", configuration); @@ -6451,10 +6451,10 @@ public void EnsureReleaseBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch(bo [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6473,7 +6473,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -6490,7 +6490,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -6521,7 +6521,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6539,10 +6539,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMain(bool useTrunkBased, Incr [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6561,7 +6561,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6578,7 +6578,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6609,7 +6609,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.0.3-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.3"); + if (!useMainline) fixture.ApplyTag("0.0.3"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6625,10 +6625,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6647,7 +6647,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6664,7 +6664,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6692,7 +6692,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-2+6", configuration); @@ -6703,7 +6703,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("0.0.3-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.2"); fixture.ApplyTag("0.0.2"); @@ -6725,10 +6725,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6747,7 +6747,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6764,7 +6764,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6795,7 +6795,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.3-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.3"); + if (!useMainline) fixture.ApplyTag("0.0.3"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6811,10 +6811,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6833,7 +6833,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6850,7 +6850,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6881,7 +6881,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6897,10 +6897,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/0.0.0")] [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] - public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -6919,7 +6919,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -6936,7 +6936,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -6967,7 +6967,7 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -6987,10 +6987,10 @@ public void EnsureReleaseBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch(b [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7009,7 +7009,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -7026,7 +7026,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -7057,7 +7057,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7075,10 +7075,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMain(bool useTrunkBased, Incr [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7097,7 +7097,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7114,7 +7114,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7145,7 +7145,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("0.3.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.3.0"); + if (!useMainline) fixture.ApplyTag("0.3.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7163,10 +7163,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.1.0")] [TestCase(true, "release/0.1.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7185,7 +7185,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7202,7 +7202,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7230,7 +7230,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-2+6", configuration); @@ -7241,7 +7241,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("0.3.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.2.0"); fixture.ApplyTag("0.2.0"); @@ -7263,10 +7263,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7285,7 +7285,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7302,7 +7302,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7330,7 +7330,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.2.1-1+6", configuration); @@ -7341,7 +7341,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b fixture.AssertFullSemver("0.3.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.2.1"); + if (!useMainline) fixture.ApplyTag("0.2.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7359,10 +7359,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7381,7 +7381,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7398,7 +7398,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7429,7 +7429,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.3.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.3.0"); + if (!useMainline) fixture.ApplyTag("0.3.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7449,10 +7449,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/0.1.0")] [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] - public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7471,7 +7471,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7488,7 +7488,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7519,7 +7519,7 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7539,10 +7539,10 @@ public void EnsureReleaseBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch(b [TestCase(true, IncrementStrategy.Minor)] [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] - public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7561,7 +7561,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/3.0.0"); // ✅ succeeds as expected @@ -7578,7 +7578,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo("release/3.0.0"); // ✅ succeeds as expected @@ -7609,7 +7609,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7633,10 +7633,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMain(bool useTrunkBased, Incr [TestCase(true, "release/1.1.0")] [TestCase(false, "release/1.1.1")] [TestCase(true, "release/1.1.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7655,7 +7655,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7672,7 +7672,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7703,7 +7703,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7721,10 +7721,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch [TestCase(true, "release/0.0.1")] [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7743,7 +7743,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7760,7 +7760,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7788,7 +7788,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+6", configuration); @@ -7799,7 +7799,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("2.0.0"); fixture.ApplyTag("2.0.0"); @@ -7823,10 +7823,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch(bo [TestCase(true, "release/1.0.0")] [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7845,7 +7845,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7862,7 +7862,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7890,7 +7890,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.1-1+6", configuration); @@ -7901,7 +7901,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.0.1"); + if (!useMainline) fixture.ApplyTag("2.0.1"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -7923,10 +7923,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch(b [TestCase(true, "release/1.0.1")] [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -7945,7 +7945,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -7962,7 +7962,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -7990,7 +7990,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.1.0-1+6", configuration); @@ -8001,7 +8001,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b fixture.AssertFullSemver("3.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("2.1.0"); + if (!useMainline) fixture.ApplyTag("2.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -8029,10 +8029,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch(b [TestCase(true, "release/1.1.0")] [TestCase(false, "release/1.1.1")] [TestCase(true, "release/1.1.1")] - public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8051,7 +8051,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8068,7 +8068,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -8099,7 +8099,7 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b // ✅ succeeds as expected fixture.AssertFullSemver("3.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("3.0.0"); + if (!useMainline) fixture.ApplyTag("3.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -8116,10 +8116,10 @@ public void EnsureReleaseBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch(b [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8141,7 +8141,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -8195,7 +8195,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8221,10 +8221,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMain( [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8246,7 +8246,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8300,7 +8300,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8324,10 +8324,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndInheritOnR [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8349,7 +8349,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8400,7 +8400,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+6", configuration); @@ -8411,7 +8411,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("1.0.0"); fixture.ApplyTag("1.0.0"); @@ -8441,10 +8441,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndNoneOnRele [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8466,7 +8466,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8517,7 +8517,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+6", configuration); @@ -8528,7 +8528,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.0.1"); + if (!useMainline) fixture.ApplyTag("1.0.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8558,10 +8558,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndPatchOnRel [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8583,7 +8583,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8634,7 +8634,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+6", configuration); @@ -8645,7 +8645,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.1.0"); + if (!useMainline) fixture.ApplyTag("1.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8679,10 +8679,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMinorOnRel [TestCase(false, "release/2.0.0")] [TestCase(true, "release/2.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8704,7 +8704,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8758,7 +8758,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -8775,10 +8775,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementInheritOnMainAndMajorOnRel [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8800,7 +8800,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -8854,10 +8854,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-2+1", configuration); @@ -8874,10 +8874,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMain( [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -8899,7 +8899,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -8950,7 +8950,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+6", configuration); @@ -8961,14 +8961,14 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+1", configuration); @@ -8985,10 +8985,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndInheritOnRele [TestCase(false, "release/0.0.0")] [TestCase(true, "release/0.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9010,7 +9010,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9061,7 +9061,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-2+6", configuration); @@ -9072,14 +9072,14 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease fixture.AssertFullSemver("0.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.0"); fixture.ApplyTag("0.0.0"); } fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-3+1", configuration); @@ -9097,10 +9097,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndNoneOnRelease [TestCase(true, "release/0.0.0")] [TestCase(true, "release/0.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9122,7 +9122,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9176,10 +9176,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+1", configuration); @@ -9199,10 +9199,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndPatchOnReleas [TestCase(true, "release/0.0.2")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9224,7 +9224,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9278,10 +9278,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+1", configuration); @@ -9304,10 +9304,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMinorOnReleas [TestCase(true, "release/0.2.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9329,7 +9329,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.0"); + if (!useMainline) fixture.ApplyTag("0.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9383,10 +9383,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+1", configuration); @@ -9408,10 +9408,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementNoneOnMainAndMajorOnReleas [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9433,7 +9433,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -9487,7 +9487,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9503,10 +9503,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMain( [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9528,7 +9528,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9582,7 +9582,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9596,10 +9596,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndInheritOnRel [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9621,7 +9621,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9672,7 +9672,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-2+6", configuration); @@ -9683,7 +9683,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas fixture.AssertFullSemver("0.0.2-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.0.1"); fixture.ApplyTag("0.0.1"); @@ -9703,10 +9703,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndNoneOnReleas [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9728,7 +9728,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9782,7 +9782,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9797,10 +9797,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndPatchOnRelea [TestCase(true, "release/0.0.1")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9822,7 +9822,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9876,7 +9876,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9895,10 +9895,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMinorOnRelea [TestCase(true, "release/0.1.1")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -9920,7 +9920,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -9974,7 +9974,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -9991,10 +9991,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementPatchOnMainAndMajorOnRelea [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10016,7 +10016,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -10070,7 +10070,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10092,10 +10092,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMain( [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10117,7 +10117,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10171,7 +10171,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10189,10 +10189,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndInheritOnRel [TestCase(false, "release/0.1.0")] [TestCase(true, "release/0.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10214,7 +10214,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10265,7 +10265,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-2+6", configuration); @@ -10276,7 +10276,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas fixture.AssertFullSemver("0.2.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("0.1.0"); fixture.ApplyTag("0.1.0"); @@ -10300,10 +10300,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndNoneOnReleas [TestCase(false, "release/0.1.1")] [TestCase(true, "release/0.1.1")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10325,7 +10325,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10376,7 +10376,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("0.1.1-1+6", configuration); @@ -10387,7 +10387,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea fixture.AssertFullSemver("0.2.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("0.1.1"); + if (!useMainline) fixture.ApplyTag("0.1.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10409,10 +10409,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndPatchOnRelea [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10434,7 +10434,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10488,7 +10488,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.2.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.2.0"); + if (!useMainline) fixture.ApplyTag("0.2.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10510,10 +10510,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMinorOnRelea [TestCase(false, "release/0.2.0")] [TestCase(true, "release/0.2.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10535,7 +10535,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10589,7 +10589,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10606,10 +10606,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMinorOnMainAndMajorOnRelea [TestCase(false, IncrementStrategy.Major)] [TestCase(true, IncrementStrategy.Major)] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( - bool useTrunkBased, IncrementStrategy incrementOnReleaseBranch) + bool useMainline, IncrementStrategy incrementOnReleaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10631,7 +10631,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -10685,7 +10685,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10711,10 +10711,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMain( [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10736,7 +10736,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10790,7 +10790,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -10814,10 +10814,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndInheritOnRel [TestCase(false, "release/1.0.0")] [TestCase(true, "release/1.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10839,7 +10839,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -10890,7 +10890,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-2+6", configuration); @@ -10901,7 +10901,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) + if (!useMainline) { fixture.Repository.Tags.Remove("1.0.0"); fixture.ApplyTag("1.0.0"); @@ -10931,10 +10931,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndNoneOnReleas [TestCase(false, "release/1.0.1")] [TestCase(true, "release/1.0.1")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -10956,7 +10956,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11007,7 +11007,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.0.1-1+6", configuration); @@ -11018,7 +11018,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.0.1"); + if (!useMainline) fixture.ApplyTag("1.0.1"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -11048,10 +11048,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndPatchOnRelea [TestCase(false, "release/1.1.0")] [TestCase(true, "release/1.1.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -11073,7 +11073,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11124,7 +11124,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea fixture.MergeTo("main", removeBranchAfterMerging: true); - if (useTrunkBased) + if (useMainline) { // ✅ succeeds as expected fixture.AssertFullSemver("1.1.0-1+6", configuration); @@ -11135,7 +11135,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea fixture.AssertFullSemver("2.0.0-1+6", configuration); } - if (!useTrunkBased) fixture.ApplyTag("1.1.0"); + if (!useMainline) fixture.ApplyTag("1.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -11169,10 +11169,10 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMinorOnRelea [TestCase(false, "release/2.0.0")] [TestCase(true, "release/2.0.0")] public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnReleaseBranch( - bool useTrunkBased, string releaseBranch) + bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder .WithIncrement(IncrementStrategy.Major) @@ -11194,7 +11194,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-1+1", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -11248,7 +11248,7 @@ public void EnsureReleaseAndFeatureBranchWithIncrementMajorOnMainAndMajorOnRelea // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-1+6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected diff --git a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs similarity index 90% rename from src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow.cs rename to src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs index 071cc53ad9..8b5a72a238 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs @@ -5,7 +5,7 @@ namespace GitVersion.Core.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] -public class CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow +public class CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow { private static GitFlowConfigurationBuilder configurationBuilder => GitFlowConfigurationBuilder.New; @@ -14,10 +14,10 @@ public class CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitFlow /// [TestCase(false)] [TestCase(true)] - public void EnsureFeature(bool useTrunkBased) + public void EnsureFeature(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -28,13 +28,13 @@ public void EnsureFeature(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -71,10 +71,10 @@ public void EnsureFeature(bool useTrunkBased) /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeature(bool useTrunkBased) + public void EnsureMergeMainToFeature(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -85,7 +85,7 @@ public void EnsureMergeMainToFeature(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -102,7 +102,7 @@ public void EnsureMergeMainToFeature(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -139,10 +139,10 @@ public void EnsureMergeMainToFeature(bool useTrunkBased) /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequest(bool useTrunkBased) + public void EnsurePullRequest(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -153,7 +153,7 @@ public void EnsurePullRequest(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -181,10 +181,10 @@ public void EnsurePullRequest(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureReleaseAndFeatureBranch(bool useTrunkBased) + public void EnsureReleaseAndFeatureBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -195,7 +195,7 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -249,7 +249,7 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -265,10 +265,10 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased) [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] [TestCase(true, "release/0.1.0")] - public void EnsureReleaseAndFeatureBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseAndFeatureBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -279,7 +279,7 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased, string releaseBran // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -333,7 +333,7 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased, string releaseBran // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -345,10 +345,10 @@ public void EnsureReleaseAndFeatureBranch(bool useTrunkBased, string releaseBran /// [TestCase(false)] [TestCase(true)] - public void EnsureReleaseBranch(bool useTrunkBased) + public void EnsureReleaseBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -359,7 +359,7 @@ public void EnsureReleaseBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -376,7 +376,7 @@ public void EnsureReleaseBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -407,7 +407,7 @@ public void EnsureReleaseBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -426,10 +426,10 @@ public void EnsureReleaseBranch(bool useTrunkBased) [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] [TestCase(true, "release/0.1.0")] - public void EnsureReleaseBranch(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranch(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -440,7 +440,7 @@ public void EnsureReleaseBranch(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -457,7 +457,7 @@ public void EnsureReleaseBranch(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -488,7 +488,7 @@ public void EnsureReleaseBranch(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -497,10 +497,10 @@ public void EnsureReleaseBranch(bool useTrunkBased, string releaseBranch) [TestCase(false)] [TestCase(true)] - public void EnsureFeatureDevelopmentWithDevelopBranch(bool useTrunkBased) + public void EnsureFeatureDevelopmentWithDevelopBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -511,7 +511,7 @@ public void EnsureFeatureDevelopmentWithDevelopBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -585,7 +585,7 @@ public void EnsureFeatureDevelopmentWithDevelopBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-7", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -594,10 +594,10 @@ public void EnsureFeatureDevelopmentWithDevelopBranch(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureFeatureDevelopmentWithDevelopBranchFast(bool useTrunkBased) + public void EnsureFeatureDevelopmentWithDevelopBranchFast(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -608,7 +608,7 @@ public void EnsureFeatureDevelopmentWithDevelopBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -667,7 +667,7 @@ public void EnsureFeatureDevelopmentWithDevelopBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-5", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("E"); // ✅ succeeds as expected @@ -676,10 +676,10 @@ public void EnsureFeatureDevelopmentWithDevelopBranchFast(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureDevelopmentWithMainBranchFast(bool useTrunkBased) + public void EnsureDevelopmentWithMainBranchFast(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -690,7 +690,7 @@ public void EnsureDevelopmentWithMainBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -730,7 +730,7 @@ public void EnsureDevelopmentWithMainBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-4", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -739,10 +739,10 @@ public void EnsureDevelopmentWithMainBranchFast(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureBugFixWithMainBranch(bool useTrunkBased) + public void EnsureBugFixWithMainBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -753,7 +753,7 @@ public void EnsureBugFixWithMainBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("hotfix/bar"); // ✅ succeeds as expected @@ -793,7 +793,7 @@ public void EnsureBugFixWithMainBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-4", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -802,10 +802,10 @@ public void EnsureBugFixWithMainBranch(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureBugFixWithDevelopBranch(bool useTrunkBased) + public void EnsureBugFixWithDevelopBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -816,7 +816,7 @@ public void EnsureBugFixWithDevelopBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -872,7 +872,7 @@ public void EnsureBugFixWithDevelopBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-5", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -881,10 +881,10 @@ public void EnsureBugFixWithDevelopBranch(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureBugFixWithDevelopBranchFast(bool useTrunkBased) + public void EnsureBugFixWithDevelopBranchFast(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -895,7 +895,7 @@ public void EnsureBugFixWithDevelopBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -946,7 +946,7 @@ public void EnsureBugFixWithDevelopBranchFast(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-4", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("E"); // ✅ succeeds as expected @@ -955,10 +955,10 @@ public void EnsureBugFixWithDevelopBranchFast(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureFeatureDevelopmentWithReleaseNextBranch(bool useTrunkBased) + public void EnsureFeatureDevelopmentWithReleaseNextBranch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -969,7 +969,7 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -1055,7 +1055,7 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-8", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -1064,10 +1064,10 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranch(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureFeatureDevelopmentWithReleaseNextBranchFast(bool useTrunkBased) + public void EnsureFeatureDevelopmentWithReleaseNextBranchFast(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -1078,7 +1078,7 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranchFast(bool useTrunkBased // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -1159,7 +1159,7 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranchFast(bool useTrunkBased // ✅ succeeds as expected fixture.AssertFullSemver("0.1.0-7", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.1.0"); + if (!useMainline) fixture.ApplyTag("0.1.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -1168,10 +1168,10 @@ public void EnsureFeatureDevelopmentWithReleaseNextBranchFast(bool useTrunkBased [TestCase(false)] [TestCase(true)] - public void EnsureFeatureDevelopmentWithRelease100Branch(bool useTrunkBased) + public void EnsureFeatureDevelopmentWithRelease100Branch(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -1182,7 +1182,7 @@ public void EnsureFeatureDevelopmentWithRelease100Branch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("develop"); // ✅ succeeds as expected @@ -1268,7 +1268,7 @@ public void EnsureFeatureDevelopmentWithRelease100Branch(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("1.0.0-8", configuration); - if (!useTrunkBased) fixture.ApplyTag("1.0.0"); + if (!useMainline) fixture.ApplyTag("1.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected diff --git a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs similarity index 88% rename from src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow.cs rename to src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs index 58136956fa..be5fdfff17 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs @@ -5,7 +5,7 @@ namespace GitVersion.Core.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] -public class CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow +public class CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow { private static GitHubFlowConfigurationBuilder configurationBuilder => GitHubFlowConfigurationBuilder.New; @@ -14,10 +14,10 @@ public class CompareTheDifferentWhenUsingTrunkBasedVersionStrategyWithGitHubFlow /// [TestCase(false)] [TestCase(true)] - public void EnsureFeature1(bool useTrunkBased) + public void EnsureFeature1(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -28,13 +28,13 @@ public void EnsureFeature1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.MakeACommit("B"); // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -71,10 +71,10 @@ public void EnsureFeature1(bool useTrunkBased) /// [TestCase(false)] [TestCase(true)] - public void EnsureMergeMainToFeature2(bool useTrunkBased) + public void EnsureMergeMainToFeature2(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -85,7 +85,7 @@ public void EnsureMergeMainToFeature2(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -102,7 +102,7 @@ public void EnsureMergeMainToFeature2(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("feature/foo"); // ✅ succeeds as expected @@ -139,10 +139,10 @@ public void EnsureMergeMainToFeature2(bool useTrunkBased) /// [TestCase(false)] [TestCase(true)] - public void EnsurePullRequest(bool useTrunkBased) + public void EnsurePullRequest(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -153,7 +153,7 @@ public void EnsurePullRequest(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("feature/foo"); // ✅ succeeds as expected @@ -181,10 +181,10 @@ public void EnsurePullRequest(bool useTrunkBased) [TestCase(false)] [TestCase(true)] - public void EnsureReleaseAndFeatureBranch1(bool useTrunkBased) + public void EnsureReleaseAndFeatureBranch1(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -195,7 +195,7 @@ public void EnsureReleaseAndFeatureBranch1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -249,7 +249,7 @@ public void EnsureReleaseAndFeatureBranch1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -263,10 +263,10 @@ public void EnsureReleaseAndFeatureBranch1(bool useTrunkBased) [TestCase(false, "release/0.0.1")] [TestCase(true, "release/0.0.1")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseAndFeatureBranch2(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseAndFeatureBranch2(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -277,7 +277,7 @@ public void EnsureReleaseAndFeatureBranch2(bool useTrunkBased, string releaseBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -331,7 +331,7 @@ public void EnsureReleaseAndFeatureBranch2(bool useTrunkBased, string releaseBra // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MakeACommit("F"); // ✅ succeeds as expected @@ -343,10 +343,10 @@ public void EnsureReleaseAndFeatureBranch2(bool useTrunkBased, string releaseBra /// [TestCase(false)] [TestCase(true)] - public void EnsureReleaseBranch1(bool useTrunkBased) + public void EnsureReleaseBranch1(bool useMainline) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -357,7 +357,7 @@ public void EnsureReleaseBranch1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo("release/2.0.0"); // ✅ succeeds as expected @@ -374,7 +374,7 @@ public void EnsureReleaseBranch1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo("release/2.0.0"); // ✅ succeeds as expected @@ -405,7 +405,7 @@ public void EnsureReleaseBranch1(bool useTrunkBased) // ✅ succeeds as expected fixture.AssertFullSemver("2.0.0-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("2.0.0"); + if (!useMainline) fixture.ApplyTag("2.0.0"); fixture.MakeACommit("G"); // ✅ succeeds as expected @@ -423,10 +423,10 @@ public void EnsureReleaseBranch1(bool useTrunkBased) [TestCase(true, "release/0.0.1")] [TestCase(false, "release/0.0.2")] [TestCase(true, "release/0.0.2")] - public void EnsureReleaseBranch2(bool useTrunkBased, string releaseBranch) + public void EnsureReleaseBranch2(bool useMainline, string releaseBranch) { - var builder = useTrunkBased - ? configurationBuilder.WithVersionStrategy(VersionStrategies.TrunkBased) + var builder = useMainline + ? configurationBuilder.WithVersionStrategy(VersionStrategies.Mainline) : configurationBuilder; var configuration = builder.Build(); @@ -437,7 +437,7 @@ public void EnsureReleaseBranch2(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.1-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.1"); + if (!useMainline) fixture.ApplyTag("0.0.1"); fixture.BranchTo(releaseBranch); // ✅ succeeds as expected @@ -454,7 +454,7 @@ public void EnsureReleaseBranch2(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.2-1", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.2"); + if (!useMainline) fixture.ApplyTag("0.0.2"); fixture.MergeTo(releaseBranch); // ✅ succeeds as expected @@ -485,7 +485,7 @@ public void EnsureReleaseBranch2(bool useTrunkBased, string releaseBranch) // ✅ succeeds as expected fixture.AssertFullSemver("0.0.3-6", configuration); - if (!useTrunkBased) fixture.ApplyTag("0.0.3"); + if (!useMainline) fixture.ApplyTag("0.0.3"); fixture.MakeACommit("G"); // ✅ succeeds as expected diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs b/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs index 13a25d7a30..1b77c9d6a7 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs @@ -19,12 +19,6 @@ private static GitHubFlowConfigurationBuilder GetConfigurationBuilder() => GitHu .WithIncrement(IncrementStrategy.Inherit).WithLabel("{BranchName}") ); - private static readonly IGitVersionConfiguration trunkBased = GetConfigurationBuilder() - .WithVersionStrategy(VersionStrategies.TrunkBased) - .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDeployment)) - .WithBranch("feature", _ => _.WithIsMainBranch(false).WithDeploymentMode(DeploymentMode.ContinuousDelivery)) - .Build(); - private static readonly IGitVersionConfiguration continuousDeployment = GetConfigurationBuilder() .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithBranch("main", _ => _.WithIsMainBranch(true).WithDeploymentMode(DeploymentMode.ContinuousDeployment)) @@ -51,7 +45,6 @@ public void ExpectedBehavior() fixture.MakeATaggedCommit("1.0.0"); // ✅ succeeds as expected - fixture.AssertFullSemver("1.0.0", trunkBased); fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0", continuousDelivery); fixture.AssertFullSemver("1.0.0", manualDeployment); @@ -59,7 +52,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - fixture.AssertFullSemver("1.0.1", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-1", continuousDelivery); fixture.AssertFullSemver("1.0.1-1+1", manualDeployment); @@ -67,7 +59,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - fixture.AssertFullSemver("1.0.2", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-2", continuousDelivery); fixture.AssertFullSemver("1.0.1-1+2", manualDeployment); @@ -75,7 +66,6 @@ public void ExpectedBehavior() fixture.ApplyTag("1.0.1-alpha.1"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-alpha.1", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-alpha.1", continuousDelivery); fixture.AssertFullSemver("1.0.1-alpha.1", manualDeployment); @@ -83,7 +73,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-alpha.2", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-alpha.2", continuousDelivery); fixture.AssertFullSemver("1.0.1-alpha.2+1", manualDeployment); @@ -91,7 +80,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-alpha.3", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-alpha.3", continuousDelivery); fixture.AssertFullSemver("1.0.1-alpha.2+2", manualDeployment); @@ -99,7 +87,6 @@ public void ExpectedBehavior() fixture.MakeATaggedCommit("1.0.1-beta.1"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-beta.1", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-beta.1", continuousDelivery); fixture.AssertFullSemver("1.0.1-beta.1", manualDeployment); @@ -107,7 +94,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-beta.2", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-beta.2", continuousDelivery); fixture.AssertFullSemver("1.0.1-beta.2+1", manualDeployment); @@ -115,7 +101,6 @@ public void ExpectedBehavior() fixture.MakeATaggedCommit("1.0.1-beta.2"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-beta.2", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-beta.2", continuousDelivery); fixture.AssertFullSemver("1.0.1-beta.2", manualDeployment); @@ -123,7 +108,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1-beta.3", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1-beta.3", continuousDelivery); fixture.AssertFullSemver("1.0.1-beta.3+1", manualDeployment); @@ -131,7 +115,6 @@ public void ExpectedBehavior() fixture.ApplyTag("1.0.1"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.1", trunkBased); fixture.AssertFullSemver("1.0.1", continuousDeployment); fixture.AssertFullSemver("1.0.1", continuousDelivery); fixture.AssertFullSemver("1.0.1", manualDeployment); @@ -139,7 +122,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.2", trunkBased); fixture.AssertFullSemver("1.0.2", continuousDeployment); fixture.AssertFullSemver("1.0.2-1", continuousDelivery); fixture.AssertFullSemver("1.0.2-1+1", manualDeployment); @@ -147,7 +129,6 @@ public void ExpectedBehavior() fixture.ApplyTag("1.0.2-1"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.2-1", trunkBased); fixture.AssertFullSemver("1.0.2", continuousDeployment); fixture.AssertFullSemver("1.0.2-1", continuousDelivery); fixture.AssertFullSemver("1.0.2-1", manualDeployment); @@ -155,7 +136,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.2-2", trunkBased); fixture.AssertFullSemver("1.0.2", continuousDeployment); fixture.AssertFullSemver("1.0.2-2", continuousDelivery); fixture.AssertFullSemver("1.0.2-2+1", manualDeployment); @@ -163,7 +143,6 @@ public void ExpectedBehavior() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.0.2-3", trunkBased); fixture.AssertFullSemver("1.0.2", continuousDeployment); fixture.AssertFullSemver("1.0.2-3", continuousDelivery); fixture.AssertFullSemver("1.0.2-2+2", manualDeployment); @@ -177,7 +156,6 @@ public void MainRelease() fixture.MakeATaggedCommit("0.0.2"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.2", trunkBased); fixture.AssertFullSemver("0.0.2", continuousDeployment); fixture.AssertFullSemver("0.0.2", continuousDelivery); fixture.AssertFullSemver("0.0.2", manualDeployment); @@ -193,16 +171,14 @@ public void MergeFeatureToMain() fixture.MakeACommit(); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.3-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-test.1", continuousDelivery); fixture.AssertFullSemver("0.0.3-test.1+1", manualDeployment); fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.0.3-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-test.2", continuousDelivery); fixture.AssertFullSemver("0.0.3-test.1+2", manualDeployment); @@ -211,7 +187,6 @@ public void MergeFeatureToMain() fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.3", trunkBased); fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-3", continuousDelivery); fixture.AssertFullSemver("0.0.3-1+3", manualDeployment); @@ -226,7 +201,6 @@ public void MergeFeatureToMainWithPreviousCommits() fixture.MakeACommit(); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.3", trunkBased); fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-1", continuousDelivery); fixture.AssertFullSemver("0.0.3-1+1", manualDeployment); @@ -234,7 +208,6 @@ public void MergeFeatureToMainWithPreviousCommits() fixture.MakeACommit(); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.4", trunkBased); fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-2", continuousDelivery); fixture.AssertFullSemver("0.0.3-1+2", manualDeployment); @@ -243,16 +216,14 @@ public void MergeFeatureToMainWithPreviousCommits() fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.0.5-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-test.3", continuousDelivery); fixture.AssertFullSemver("0.0.3-test.1+3", manualDeployment); fixture.MakeACommit(); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.0.5-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-test.4", continuousDelivery); fixture.AssertFullSemver("0.0.3-test.1+4", manualDeployment); @@ -261,7 +232,6 @@ public void MergeFeatureToMainWithPreviousCommits() fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.0.5", trunkBased); fixture.AssertFullSemver("0.0.3", continuousDeployment); fixture.AssertFullSemver("0.0.3-5", continuousDelivery); fixture.AssertFullSemver("0.0.3-1+5", manualDeployment); @@ -277,16 +247,14 @@ public void MergeFeatureToMainWithMinorMinorSemversionIncrement() fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.1.0-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-test.1", continuousDelivery); fixture.AssertFullSemver("0.1.0-test.1+1", manualDeployment); fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.1.0-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-test.2", continuousDelivery); fixture.AssertFullSemver("0.1.0-test.1+2", manualDeployment); @@ -295,7 +263,6 @@ public void MergeFeatureToMainWithMinorMinorSemversionIncrement() fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.2.0", trunkBased); fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-3", continuousDelivery); fixture.AssertFullSemver("0.1.0-1+3", manualDeployment); @@ -311,16 +278,14 @@ public void MergeFeatureToMainWithMajorMinorSemversionIncrement() fixture.MakeACommit("+semver: major"); // ✅ succeeds as expected - fixture.AssertFullSemver("1.0.0-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-test.1", continuousDelivery); fixture.AssertFullSemver("1.0.0-test.1+1", manualDeployment); fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("1.0.0-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-test.2", continuousDelivery); fixture.AssertFullSemver("1.0.0-test.1+2", manualDeployment); @@ -329,7 +294,6 @@ public void MergeFeatureToMainWithMajorMinorSemversionIncrement() fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.1.0", trunkBased); fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-3", continuousDelivery); fixture.AssertFullSemver("1.0.0-1+3", manualDeployment); @@ -344,7 +308,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMinorSemversionIncremen fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.1.0", trunkBased); fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-1", continuousDelivery); fixture.AssertFullSemver("0.1.0-1+1", manualDeployment); @@ -352,7 +315,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMinorSemversionIncremen fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.2.0", trunkBased); fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-2", continuousDelivery); fixture.AssertFullSemver("0.1.0-1+2", manualDeployment); @@ -361,16 +323,14 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMinorSemversionIncremen fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.3.0-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-test.3", continuousDelivery); fixture.AssertFullSemver("0.1.0-test.1+3", manualDeployment); fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.4.0-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-test.4", continuousDelivery); fixture.AssertFullSemver("0.1.0-test.1+4", manualDeployment); @@ -379,7 +339,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMinorSemversionIncremen fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - //fixture.AssertFullSemver("0.4.0", trunkBased); fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-5", continuousDelivery); fixture.AssertFullSemver("0.1.0-1+5", manualDeployment); @@ -394,7 +353,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMajorSemversionIncremen fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - fixture.AssertFullSemver("0.1.0", trunkBased); fixture.AssertFullSemver("0.1.0", continuousDeployment); fixture.AssertFullSemver("0.1.0-1", continuousDelivery); fixture.AssertFullSemver("0.1.0-1+1", manualDeployment); @@ -402,7 +360,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMajorSemversionIncremen fixture.MakeACommit("+semver: major"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.1.0", trunkBased); fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-2", continuousDelivery); fixture.AssertFullSemver("1.0.0-1+2", manualDeployment); @@ -410,7 +367,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMajorSemversionIncremen fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - //fixture.AssertFullSemver("1.1.0", trunkBased); fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-3", continuousDelivery); fixture.AssertFullSemver("1.0.0-1+3", manualDeployment); @@ -419,16 +375,14 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMajorSemversionIncremen fixture.MakeACommit("+semver: major"); // ✅ succeeds as expected - //fixture.AssertFullSemver("2.1.0-test.1", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-test.4", continuousDelivery); fixture.AssertFullSemver("1.0.0-test.1+4", manualDeployment); fixture.MakeACommit("+semver: minor"); // ✅ succeeds as expected - //fixture.AssertFullSemver("2.2.0-test.2", trunkBased); - //fixture.AssertFullSemver("?", continuousDeployment); + fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-test.5", continuousDelivery); fixture.AssertFullSemver("1.0.0-test.1+5", manualDeployment); @@ -437,7 +391,6 @@ public void MergeFeatureToMainWithPreviousCommitsAndMinorMajorSemversionIncremen fixture.Repository.Branches.Remove("feature/test"); // ✅ succeeds as expected - //fixture.AssertFullSemver("2.2.0", trunkBased); fixture.AssertFullSemver("1.0.0", continuousDeployment); fixture.AssertFullSemver("1.0.0-6", continuousDelivery); fixture.AssertFullSemver("1.0.0-1+6", manualDeployment); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs index 085c667bb5..9da73925f9 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs @@ -83,7 +83,7 @@ public void FeatureFromMainBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -224,7 +224,7 @@ public void HotfixBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -365,7 +365,7 @@ public void VersionedHotfixBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -506,7 +506,7 @@ public void ReleaseBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -647,7 +647,7 @@ public void VersionedReleaseBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -810,7 +810,7 @@ public void DevelopBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrackReleaseBranches, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrackReleaseBranches, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -984,7 +984,7 @@ public void SupportBranchWithMainline(bool withPullRequestIntoSupport) { var configuration = GitFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrackReleaseBranches, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrackReleaseBranches, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs index 14e9ef28a0..d892bdd1d7 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs @@ -83,7 +83,7 @@ public void FeatureBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitHubFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -224,7 +224,7 @@ public void ReleaseBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitHubFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); @@ -365,7 +365,7 @@ public void VersionedReleaseBranchWithMainline(bool withPullRequestIntoMain) { var configuration = GitHubFlowConfigurationBuilder.New .WithNextVersion("1.2.0") - .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.TrunkBased) + .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline) .Build(); using EmptyRepositoryFixture fixture = new("main"); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs similarity index 99% rename from src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs rename to src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs index 90f814a906..366c593102 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs @@ -4,10 +4,10 @@ namespace GitVersion.Core.Tests.IntegrationTests; -public class TrunkBasedDevelopmentScenarios : TestBase +public class MainlineDevelopmentScenarios : TestBase { private static GitFlowConfigurationBuilder GetConfigurationBuilder() => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", builder => builder .WithIsMainBranch(true).WithIncrement(IncrementStrategy.Patch) .WithDeploymentMode(DeploymentMode.ContinuousDeployment) @@ -424,7 +424,7 @@ public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionO public void VerifyIncrementConfigIsHonoured() { var minorIncrementConfig = GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", builder => builder .WithDeploymentMode(DeploymentMode.ContinuousDeployment) .WithIncrement(IncrementStrategy.None) diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs index eecb4da7ba..0ceff64960 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs @@ -1256,10 +1256,10 @@ public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrect() [TestCase(false, "2.0.0-alpha.2")] [TestCase(true, "2.0.0-alpha.2")] - public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForTrunkBased(bool applyTag, string semanticVersion) + public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForMainline(bool applyTag, string semanticVersion) { var configuration = GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased) + .WithVersionStrategy(VersionStrategies.Mainline) .Build(); using var fixture = new EmptyRepositoryFixture(); diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs index c0e322fe86..5279dbaaf6 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs @@ -86,7 +86,7 @@ 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-]*\\))?:") - .WithVersionStrategy(VersionStrategies.TrunkBased) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", builder => builder.WithDeploymentMode(DeploymentMode.ContinuousDeployment)) .Build(); diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs similarity index 90% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs index d6dde387bd..bb66b40d71 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitFlow +internal partial class MainlineScenariosWithAGitFlow { [Parallelizable(ParallelScope.All)] public class GivenADevelopBranchWithOneCommitMergedToMainWhen { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New.WithLabel(null) - .WithVersionStrategy(VersionStrategies.TrunkBased) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New.WithLabel(null) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("develop", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); @@ -58,12 +58,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("develop", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-2+2")] @@ -87,12 +87,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("develop", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs similarity index 90% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs index 33fb2b9aef..c84ca98dc2 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitFlow +internal partial class MainlineScenariosWithAGitFlow { [Parallelizable(ParallelScope.All)] public class GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New.WithLabel(null) - .WithVersionStrategy(VersionStrategies.TrunkBased) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New.WithLabel(null) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("develop", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); @@ -60,12 +60,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")] public string GetVersionWithTrackMergeTargetOnDevelop(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("develop", _ => _.WithIncrement(increment).WithTrackMergeTarget(true)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+1")] @@ -89,12 +89,12 @@ public string GetVersionWithTrackMergeTargetOnDevelop(IncrementStrategy incremen [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+1")] public string GetVersionWithNoTrackMergeTargetOnDevelop(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("develop", _ => _.WithIncrement(increment).WithTrackMergeTarget(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs similarity index 97% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs index d5459cdbbf..3160655c09 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitFlow +internal partial class MainlineScenariosWithAGitFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New.WithLabel(null) - .WithVersionStrategy(VersionStrategies.TrunkBased) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New.WithLabel(null) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -133,12 +133,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "bar", ExpectedResult = "3.0.0-bar.1+3")] public string GetVersion(IncrementStrategy increment, IncrementStrategy incrementOnFeature, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .WithBranch("feature", _ => _.WithIncrement(incrementOnFeature)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+3")] @@ -227,12 +227,12 @@ public string GetVersion(IncrementStrategy increment, IncrementStrategy incremen public string GetVersionWithPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy increment, IncrementStrategy incrementOnFeature, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(incrementOnFeature)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs similarity index 93% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs index 30f8101bd8..9b2772f1a8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithAMergeCommitFromMainWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New.WithLabel(null) - .WithVersionStrategy(VersionStrategies.TrunkBased) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New.WithLabel(null) + .WithVersionStrategy(VersionStrategies.Mainline) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -67,12 +67,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, ExpectedResult = "3.0.0-foo.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.1+2")] @@ -100,12 +100,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, ExpectedResult = "3.0.0-foo.1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.3+2")] @@ -133,12 +133,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, ExpectedResult = "3.0.0-foo.1+2")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.1+2")] @@ -166,12 +166,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, ExpectedResult = "3.0.0-foo.1+2")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs index e96310cd18..9a8ff621bf 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -366,12 +366,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -479,12 +479,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs index 193cc5aed3..85b532dd2d 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,13 +254,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -369,13 +369,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+1")] @@ -484,12 +484,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -598,13 +598,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -713,13 +713,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.2+1")] @@ -827,12 +827,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -941,13 +941,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1056,13 +1056,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.2+1")] @@ -1170,12 +1170,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1284,13 +1284,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1399,13 +1399,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs index aaeaa2b476..f4fae6fa1f 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,13 +254,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -369,13 +369,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+1")] @@ -484,12 +484,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -598,13 +598,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -713,13 +713,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.2+1")] @@ -827,12 +827,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -941,13 +941,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1056,13 +1056,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.2+1")] @@ -1170,12 +1170,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1284,13 +1284,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1399,13 +1399,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs index 969aaed852..479b94b421 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,13 +254,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -369,13 +369,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+1")] @@ -483,12 +483,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -597,13 +597,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -712,13 +712,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.2+1")] @@ -826,12 +826,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -940,13 +940,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1055,13 +1055,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.2+1")] @@ -1169,12 +1169,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1283,13 +1283,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1398,13 +1398,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs index 62e32e28ff..f8fa3b092f 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs index 7236aacf6d..985860a103 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs index f650c0a6cc..f27b19a36d 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs index 0c92efc643..76caf74f85 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -142,12 +142,12 @@ public void OneTimeSetUp() public string GetVersionWithNoLabelOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -256,12 +256,12 @@ public string GetVersionWithNoLabelOnMain( public string GetVersionWithEmptyLabelOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -370,12 +370,12 @@ public string GetVersionWithEmptyLabelOnMain( public string GetVersionWithLabelFooOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -484,12 +484,12 @@ public string GetVersionWithLabelFooOnMain( public string GetVersionWithLabelBarOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs index 009b6215d1..1d2d1e8ed3 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,14 +254,14 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -370,14 +370,14 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] @@ -485,12 +485,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -599,14 +599,14 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -715,14 +715,14 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.1+1")] @@ -830,12 +830,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -944,14 +944,14 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1060,14 +1060,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.1+1")] @@ -1175,12 +1175,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1289,14 +1289,14 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1405,14 +1405,14 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs index 14d9c2ccdd..27d612ca90 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,14 +254,14 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -370,14 +370,14 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] @@ -485,12 +485,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -599,14 +599,14 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -715,14 +715,14 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.1+1")] @@ -830,12 +830,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -944,14 +944,14 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1060,14 +1060,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.1+1")] @@ -1175,12 +1175,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1289,14 +1289,14 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1405,14 +1405,14 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs index 5f0767ae1a..04344acc30 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -254,14 +254,14 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -370,14 +370,14 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] @@ -485,12 +485,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -599,14 +599,14 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -715,14 +715,14 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.1+1")] @@ -830,12 +830,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -944,14 +944,14 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1060,14 +1060,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.1+1")] @@ -1175,12 +1175,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1289,14 +1289,14 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1405,14 +1405,14 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _ .WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs index 6013c955d6..5157385de6 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs index 138761ab33..253bbcbff7 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs index 39f9620be2..c3335ac0da 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs index 88ff5cce5f..87926ce5aa 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -142,12 +142,12 @@ public void OneTimeSetUp() public string GetVersionWithNoLabelOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -236,12 +236,12 @@ public string GetVersionWithNoLabelOnMain( public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -350,12 +350,12 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag public string GetVersionWithEmptyLabelOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -444,12 +444,12 @@ public string GetVersionWithEmptyLabelOnMain( public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -558,12 +558,12 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit public string GetVersionWithLabelFooOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -652,12 +652,12 @@ public string GetVersionWithLabelFooOnMain( public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -766,12 +766,12 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa public string GetVersionWithLabelBarOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -860,12 +860,12 @@ public string GetVersionWithLabelBarOnMain( public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs index 9b6b561af9..55cc9a5785 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWhen { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -145,12 +145,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -260,12 +260,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -374,12 +374,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -489,12 +489,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -603,12 +603,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -718,12 +718,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -832,12 +832,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-bar.1+2")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -947,12 +947,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs index 92fbe59dc1..9c0044c29b 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -145,12 +145,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -259,12 +259,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -372,12 +372,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-5+1")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -487,12 +487,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -600,12 +600,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -714,12 +714,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -827,12 +827,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-bar.1+2")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -941,12 +941,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs index 20c386ca0c..6b45e8f8e7 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -145,12 +145,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -259,12 +259,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -372,12 +372,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -486,12 +486,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -599,12 +599,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -713,12 +713,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -826,12 +826,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-bar+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -940,12 +940,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs index 1527f08305..e9544cc614 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -145,12 +145,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.5+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -259,12 +259,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -372,12 +372,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -486,12 +486,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -599,12 +599,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.5+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -713,12 +713,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -826,12 +826,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-bar.1+2")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -940,12 +940,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs index 5a353777d3..6e207987f4 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -145,12 +145,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -259,12 +259,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -372,12 +372,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-1+1")] public string GetVersionWithEmpyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -486,12 +486,12 @@ public string GetVersionWithEmpyLabelOnMain(IncrementStrategy incrementOnMain, I public string GetVersionWithEmpyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+1")] @@ -599,12 +599,12 @@ public string GetVersionWithEmpyLabelAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-foo.1+1")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+1")] @@ -713,12 +713,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+1")] @@ -826,12 +826,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+1")] @@ -940,12 +940,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs index f229797b48..e6f7d83c78 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -150,12 +150,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "4.0.0-foo.1+0")] public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -265,12 +265,12 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -379,12 +379,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "4.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -494,12 +494,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4+0")] @@ -608,12 +608,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "4.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4+0")] @@ -723,12 +723,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.4+0")] @@ -837,12 +837,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "4.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.4+0")] @@ -952,12 +952,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs index 8f8ef2bbfc..3ff90c04ea 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs index d12165d239..fff98b9e2b 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs index 3f84dc2f66..1c1c9cd7ed 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs index 9a876cf5f0..984e957fcc 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs similarity index 88% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs index 9842379241..509022c68b 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -81,11 +81,11 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs similarity index 88% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs index 5abbaf3580..61b23319ac 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.0-bar")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -81,11 +81,11 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.0-bar+0")] public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs similarity index 88% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs index 9fae774544..a74ea44292 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -81,11 +81,11 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs similarity index 87% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs index fb3d3dac19..34bc870488 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.0")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -81,11 +81,11 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+0")] public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs similarity index 97% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs index 67b15775fa..a4a2e00aea 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -124,12 +124,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+3")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -217,12 +217,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+3")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -310,12 +310,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+3")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs index 772986b48c..c55a7aaede 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithThreeCommitsMergedToMainWhen { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -149,12 +149,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+4")] public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -264,12 +264,12 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -378,12 +378,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-1+4")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -493,12 +493,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+4")] @@ -607,12 +607,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+4")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+4")] @@ -722,12 +722,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+4")] @@ -836,12 +836,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-bar.1+4")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+4")] @@ -951,12 +951,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs index 97c751018b..68966d7566 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithThreeCommitsWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -56,11 +56,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+3")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs similarity index 97% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs index c0b100c769..8cf2641892 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -122,12 +122,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -215,12 +215,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -308,12 +308,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, "{BranchName}", ExpectedResult = "2.0.0-foo.1+2")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs index 101414163d..cce2fd4716 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithTwoCommitsMergedToMainWhen { private EmptyRepositoryFixture? fixture; - private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitFlowConfigurationBuilder MainlineBuilder => GitFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -147,12 +147,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+3")] public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -262,12 +262,12 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -376,12 +376,12 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-1+3")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -491,12 +491,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty).WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -605,12 +605,12 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+3")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -720,12 +720,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+3")] @@ -834,12 +834,12 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-bar.1+3")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+3")] @@ -949,12 +949,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFalseOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar").WithPreventIncrementOfMergedBranch(false)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs index b8bea24527..afd0c2b05c 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -55,11 +55,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+2")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs index 50ccd86281..3020904978 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -55,11 +55,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.3-bar+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs index 67d7c20c26..1bb394b644 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) ); @@ -55,11 +55,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+2")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs index 89bf9b3e06..eb2b472df3 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -138,12 +138,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -252,12 +252,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -365,12 +365,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -478,12 +478,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs index d8156e59d0..b034e68a17 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -138,12 +138,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -252,13 +252,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+0")] @@ -482,12 +482,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -596,13 +596,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -711,13 +711,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.2+0")] @@ -825,12 +825,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -939,13 +939,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1054,13 +1054,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.2+0")] @@ -1168,12 +1168,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1282,13 +1282,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1397,13 +1397,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs index 4019639f51..3bfce93c5f 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -138,12 +138,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -252,13 +252,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+0")] @@ -482,12 +482,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -596,13 +596,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -711,13 +711,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.2+0")] @@ -825,12 +825,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -939,13 +939,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1054,13 +1054,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.2+0")] @@ -1168,12 +1168,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1282,13 +1282,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1397,13 +1397,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs index 62e5d6ff53..9d83ae5d70 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -138,12 +138,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -252,13 +252,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+0")] @@ -481,12 +481,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -595,13 +595,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -710,13 +710,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.2+0")] @@ -824,12 +824,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -938,13 +938,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1053,13 +1053,13 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.2+0")] @@ -1167,12 +1167,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1281,13 +1281,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1396,13 +1396,13 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs index a50c1a162b..5830ea2d53 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -139,12 +139,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -366,12 +366,12 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -480,12 +480,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -593,12 +593,12 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -707,12 +707,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -820,12 +820,12 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -934,12 +934,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs index 25b6ad9987..369ea52f69 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -139,12 +139,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -366,12 +366,12 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -480,12 +480,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -593,12 +593,12 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -707,12 +707,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -820,12 +820,12 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -934,12 +934,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs index f663364bc2..adeb9fb6be 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -139,12 +139,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -366,12 +366,12 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -480,12 +480,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -593,12 +593,12 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -707,12 +707,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -820,12 +820,12 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0-foo.4")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -934,12 +934,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs index ecef9b1c3d..41117fbe87 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -139,12 +139,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -366,12 +366,12 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -480,12 +480,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -593,12 +593,12 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+0")] @@ -707,12 +707,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -820,12 +820,12 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "0.0.0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+0")] @@ -934,12 +934,12 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTaggedFalseOnFeature( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs index 10908de45a..38b2bfc8c8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs index e016a3633f..0133e2b3f0 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs index ab8ee19875..92397b4354 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs index 371606ec94..a513a2d2e3 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -50,11 +50,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -78,12 +78,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -107,12 +107,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs index 48cf614d0f..eb5a9331c7 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -51,11 +51,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs index 77fb96cb38..f38277b7d8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -51,11 +51,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.0-bar")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs index 2d96a45c8b..4be4581604 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -51,11 +51,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs index b96c62a6af..f36826d8b3 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -51,11 +51,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.0.0")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs index 9b82d11f7f..218000cfa8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithThreeCommitsWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -54,11 +54,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "3.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs index daa7518428..619534d3ff 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -253,12 +253,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -366,12 +366,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -479,12 +479,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs index f00c2d00ee..46789d0f70 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -253,13 +253,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-3+0")] @@ -481,12 +481,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -596,13 +596,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -712,13 +712,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.3+0")] @@ -826,12 +826,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -940,13 +940,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1055,14 +1055,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.3+0")] @@ -1170,12 +1170,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1284,13 +1284,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1399,13 +1399,13 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs index 53ddc84c9e..1e69f79653 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -253,13 +253,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-3+0")] @@ -481,12 +481,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -596,13 +596,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -712,13 +712,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.3+0")] @@ -826,12 +826,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -940,13 +940,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1055,14 +1055,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.3+0")] @@ -1170,12 +1170,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1284,13 +1284,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1399,13 +1399,13 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs index 44eb2c83a2..f1fd023e85 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -140,12 +140,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -253,13 +253,13 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -367,13 +367,13 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-3+0")] @@ -481,12 +481,12 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -596,13 +596,13 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -712,13 +712,13 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.3+0")] @@ -826,12 +826,12 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -940,13 +940,13 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1055,14 +1055,14 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.3+0")] @@ -1170,12 +1170,12 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1284,13 +1284,13 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1399,13 +1399,13 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar") .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs index 47ce985b4f..c46a8d5034 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-6+0")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.3+0")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.3+0")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs index 5077a32f32..9205332abe 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-3+0")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.3+0")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar+0")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "3.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs index c398abf1be..3f1b63e185 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-3+0")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.6+0")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.3+0")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs similarity index 98% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs index 5f93545dc7..51a859036c 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)) .WithBranch("feature", _ => _ .WithDeploymentMode(DeploymentMode.ManualDeployment).WithPreventIncrementWhenCurrentCommitTagged(true) @@ -141,12 +141,12 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-2+0")] @@ -254,12 +254,12 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(string.Empty)) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.2+0")] @@ -367,12 +367,12 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("foo")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.2+0")] @@ -480,12 +480,12 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In [TestCase(IncrementStrategy.Major, IncrementStrategy.Inherit, "{BranchName}", ExpectedResult = "2.0.0-foo.1+0")] public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel("bar")) .WithBranch("feature", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs index 9135837571..854c4dac22 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhen { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs index 6752bc8a94..554e8a4db2 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs index c0ea1976e5..41c92cc59d 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs index 3a707f9fa0..8041108063 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs index 61ea406039..2b9dff7f1e 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs index 713dcaf723..93aa7cd67a 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs index 8693701841..cf823959c8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs index 30a5535474..555cf673d8 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "1.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs index a3e45161f5..35d3b44309 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs index 4a236a3efb..6ce5fc53fc 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs similarity index 89% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs index 0e6f03bfcc..b15b1bdf22 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -52,11 +52,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -80,12 +80,12 @@ public string GetVersion(IncrementStrategy increment, string? label) [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -109,12 +109,12 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label) .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs index 5aa0122b0c..d6ca80b48d 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs index 15e7652db3..2db9bb62a9 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.2.0-bar")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs similarity index 85% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs index be2b625fb9..82c38a98ed 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "2.0.0-bar.1+1")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs similarity index 84% rename from src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs rename to src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs index fc773d91ab..142b30d65a 100644 --- a/src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs @@ -3,17 +3,17 @@ using GitVersion.Core.Tests.IntegrationTests; using GitVersion.VersionCalculation; -namespace GitVersion.Core.TrunkBased; +namespace GitVersion.Core.Mainline; -internal partial class TrunkBasedScenariosWithAGitHubFlow +internal partial class MainlineScenariosWithAGitHubFlow { [Parallelizable(ParallelScope.All)] public class GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable { private EmptyRepositoryFixture? fixture; - private static GitHubFlowConfigurationBuilder TrunkBasedBuilder => GitHubFlowConfigurationBuilder.New - .WithVersionStrategy(VersionStrategies.TrunkBased).WithLabel(null) + private static GitHubFlowConfigurationBuilder MainlineBuilder => GitHubFlowConfigurationBuilder.New + .WithVersionStrategy(VersionStrategies.Mainline).WithLabel(null) .WithBranch("main", _ => _.WithDeploymentMode(DeploymentMode.ManualDeployment)); [OneTimeSetUp] @@ -53,11 +53,11 @@ public void OneTimeSetUp() [TestCase(IncrementStrategy.Major, "bar", ExpectedResult = "0.2.0")] public string GetVersion(IncrementStrategy increment, string? label) { - IGitVersionConfiguration trunkBased = TrunkBasedBuilder + IGitVersionConfiguration mainline = MainlineBuilder .WithBranch("main", _ => _.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(trunkBased).FullSemVer; + return fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt index c022ac619e..1b72e90e01 100644 --- a/src/GitVersion.Core/PublicAPI.Unshipped.txt +++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt @@ -698,11 +698,11 @@ GitVersion.VersionCalculation.VersionCalculationModule.VersionCalculationModule( GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.ConfiguredNextVersion = 2 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.Fallback = 1 -> GitVersion.VersionCalculation.VersionStrategies +GitVersion.VersionCalculation.VersionStrategies.Mainline = 64 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.MergeMessage = 4 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.None = 0 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.TaggedCommit = 8 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.TrackReleaseBranches = 16 -> GitVersion.VersionCalculation.VersionStrategies -GitVersion.VersionCalculation.VersionStrategies.TrunkBased = 64 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategies.VersionInBranchName = 32 -> GitVersion.VersionCalculation.VersionStrategies GitVersion.VersionCalculation.VersionStrategyModule GitVersion.VersionCalculation.VersionStrategyModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichIncrement.cs b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs similarity index 86% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichIncrement.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs index 0b1a3d4086..91ad98cdd9 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichIncrement.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs @@ -3,11 +3,11 @@ using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; -internal sealed class EnrichIncrement : ITrunkBasedContextPreEnricher +internal sealed class EnrichIncrement : IContextPreEnricher { - public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { var effectiveConfiguration = commit.GetEffectiveConfiguration(context.Configuration); var incrementForcedByBranch = effectiveConfiguration.Increment.ToVersionField(); @@ -27,7 +27,7 @@ public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, Trunk } private static VersionField GetIncrementForcedByCommit( - TrunkBasedContext context, ICommit commit, EffectiveConfiguration configuration) + MainlineContext context, ICommit commit, EffectiveConfiguration configuration) { context.NotNull(); commit.NotNull(); diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichSemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichSemanticVersion.cs similarity index 76% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichSemanticVersion.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/EnrichSemanticVersion.cs index 41c0af40e0..ec0efc946b 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/EnrichSemanticVersion.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichSemanticVersion.cs @@ -1,11 +1,11 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; -internal sealed class EnrichSemanticVersion : ITrunkBasedContextPreEnricher +internal sealed class EnrichSemanticVersion : IContextPreEnricher { - public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { var branchSpecificLabel = context.TargetLabel; branchSpecificLabel ??= iteration.GetEffectiveConfiguration(context.Configuration) diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/IContextPostEnricher.cs b/src/GitVersion.Core/VersionCalculation/Mainline/IContextPostEnricher.cs new file mode 100644 index 0000000000..301ddccca0 --- /dev/null +++ b/src/GitVersion.Core/VersionCalculation/Mainline/IContextPostEnricher.cs @@ -0,0 +1,6 @@ +namespace GitVersion.VersionCalculation.Mainline; + +internal interface IContextPostEnricher +{ + void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context); +} diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/IContextPreEnricher.cs b/src/GitVersion.Core/VersionCalculation/Mainline/IContextPreEnricher.cs new file mode 100644 index 0000000000..cff057cc93 --- /dev/null +++ b/src/GitVersion.Core/VersionCalculation/Mainline/IContextPreEnricher.cs @@ -0,0 +1,6 @@ +namespace GitVersion.VersionCalculation.Mainline; + +internal interface IContextPreEnricher +{ + void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context); +} diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/IIncrementer.cs b/src/GitVersion.Core/VersionCalculation/Mainline/IIncrementer.cs new file mode 100644 index 0000000000..eeb2ef0a9c --- /dev/null +++ b/src/GitVersion.Core/VersionCalculation/Mainline/IIncrementer.cs @@ -0,0 +1,9 @@ +namespace GitVersion.VersionCalculation.Mainline; + +internal interface IIncrementer +{ + bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context); + + IEnumerable GetIncrements( + MainlineIteration iteration, MainlineCommit commit, MainlineContext context); +} diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedCommit.cs b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs similarity index 81% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedCommit.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs index d43c53951e..2148aa7cdc 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedCommit.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs @@ -3,21 +3,21 @@ using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; [DebuggerDisplay( @"\{ BranchName = {" + nameof(BranchName) + "}, Increment = {" + nameof(Increment) + "}, " + "HasSuccessor = {" + nameof(HasSuccessor) + "}, HasPredecessor = {" + nameof(HasPredecessor) + "}, " + "HasChildIteration = {" + nameof(HasChildIteration) + "}, Message = {" + nameof(Message) + @"} \}" )] -internal record TrunkBasedCommit(TrunkBasedIteration Iteration, ICommit? value, ReferenceName BranchName, IBranchConfiguration Configuration) +internal record MainlineCommit(MainlineIteration Iteration, ICommit? value, ReferenceName BranchName, IBranchConfiguration Configuration) { public bool IsPredecessorTheLastCommitOnTrunk(IGitVersionConfiguration configuration) => !GetEffectiveConfiguration(configuration).IsMainBranch && Predecessor?.GetEffectiveConfiguration(configuration).IsMainBranch == true; public VersionField Increment { get; set; } - public TrunkBasedIteration Iteration { get; } = Iteration.NotNull(); + public MainlineIteration Iteration { get; } = Iteration.NotNull(); public ReferenceName BranchName { get; } = BranchName.NotNull(); @@ -25,11 +25,11 @@ public bool IsPredecessorTheLastCommitOnTrunk(IGitVersionConfiguration configura public bool HasSuccessor => Successor is not null; - public TrunkBasedCommit? Successor { get; private set; } + public MainlineCommit? Successor { get; private set; } public bool HasPredecessor => Predecessor is not null; - public TrunkBasedCommit? Predecessor { get; private set; } + public MainlineCommit? Predecessor { get; private set; } public ICommit Value => IsDummy ? (Successor?.Value)! : value!; @@ -38,14 +38,14 @@ public bool IsPredecessorTheLastCommitOnTrunk(IGitVersionConfiguration configura public string Message => IsDummy ? "<>" : Value.Message; - public TrunkBasedIteration? ChildIteration { get; private set; } + public MainlineIteration? ChildIteration { get; private set; } [MemberNotNullWhen(true, nameof(ChildIteration))] public bool HasChildIteration => ChildIteration is not null && ChildIteration.Commits.Count != 0; - public TrunkBasedIteration? ParentIteration => Iteration.ParentIteration; + public MainlineIteration? ParentIteration => Iteration.ParentIteration; - public TrunkBasedCommit? ParentCommit => Iteration.ParentCommit; + public MainlineCommit? ParentCommit => Iteration.ParentCommit; [MemberNotNullWhen(true, nameof(ParentIteration), nameof(ParentCommit))] public bool HasParentIteration => Iteration.ParentIteration is not null && Iteration.ParentCommit is not null; @@ -101,14 +101,14 @@ public void AddSemanticVersions(IEnumerable values) } } - public void AddChildIteration(TrunkBasedIteration iteration) => ChildIteration = iteration.NotNull(); + public void AddChildIteration(MainlineIteration iteration) => ChildIteration = iteration.NotNull(); - public TrunkBasedCommit Append( + public MainlineCommit Append( ICommit? value, ReferenceName branchName, IBranchConfiguration configuration) { if (HasPredecessor) throw new InvalidOperationException(); - TrunkBasedCommit commit = new(Iteration, value, branchName, configuration); + MainlineCommit commit = new(Iteration, value, branchName, configuration); Predecessor = commit; commit.Successor = this; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedContext.cs b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineContext.cs similarity index 78% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedContext.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/MainlineContext.cs index 8dbd7712c8..3657484b37 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedContext.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineContext.cs @@ -2,9 +2,9 @@ using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; -internal record TrunkBasedContext(IIncrementStrategyFinder IncrementStrategyFinder, IGitVersionConfiguration Configuration) +internal record MainlineContext(IIncrementStrategyFinder IncrementStrategyFinder, IGitVersionConfiguration Configuration) { public IIncrementStrategyFinder IncrementStrategyFinder { get; } = IncrementStrategyFinder.NotNull(); diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedIteration.cs b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs similarity index 70% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedIteration.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs index 2c53fbeb74..b86db33b44 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedIteration.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs @@ -2,7 +2,7 @@ using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; [DebuggerDisplay( @"\{ Id = {" + nameof(Id) + "}, " + @@ -10,7 +10,7 @@ namespace GitVersion.VersionCalculation.TrunkBased; "Depth = {" + nameof(Depth) + "}, " + "NumberOfCommits = {" + nameof(NumberOfCommits) + "}" + @"} \}" )] -internal record TrunkBasedIteration +internal record MainlineIteration { public IBranchConfiguration Configuration { get; } @@ -25,7 +25,7 @@ public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration IBranchConfiguration branchConfiguration = Configuration; - if (branchConfiguration.Increment == IncrementStrategy.Inherit && Commits.FirstOrDefault() is TrunkBasedCommit commit) + if (branchConfiguration.Increment == IncrementStrategy.Inherit && Commits.FirstOrDefault() is MainlineCommit commit) { var parentConfiguration = commit.GetEffectiveConfiguration(configuration); branchConfiguration = branchConfiguration.Inherit(parentConfiguration); @@ -34,9 +34,9 @@ public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration return this.effectiveConfiguration = new EffectiveConfiguration(configuration, branchConfiguration); } - public TrunkBasedIteration? ParentIteration { get; } + public MainlineIteration? ParentIteration { get; } - public TrunkBasedCommit? ParentCommit { get; } + public MainlineCommit? ParentCommit { get; } public string Id { get; } @@ -46,13 +46,13 @@ public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration public int NumberOfCommits => commits.Count; - public IReadOnlyCollection Commits => commits; - private readonly Stack commits = new(); + public IReadOnlyCollection Commits => commits; + private readonly Stack commits = new(); - private readonly Dictionary commitLookup = []; + private readonly Dictionary commitLookup = []; - public TrunkBasedIteration(string id, ReferenceName branchName, IBranchConfiguration configuration, - TrunkBasedIteration? parentIteration, TrunkBasedCommit? parentCommit) + public MainlineIteration(string id, ReferenceName branchName, IBranchConfiguration configuration, + MainlineIteration? parentIteration, MainlineCommit? parentCommit) { Id = id.NotNullOrEmpty(); Depth = parentIteration?.Depth ?? 0 + 1; @@ -62,15 +62,15 @@ public TrunkBasedIteration(string id, ReferenceName branchName, IBranchConfigura ParentCommit = parentCommit; } - public TrunkBasedCommit CreateCommit( + public MainlineCommit CreateCommit( ICommit? value, ReferenceName branchName, IBranchConfiguration configuration) { - TrunkBasedCommit commit; + MainlineCommit commit; if (commits.Count != 0) commit = commits.Peek().Append(value, branchName, configuration); else { - commit = new TrunkBasedCommit(this, value, branchName, configuration); + commit = new MainlineCommit(this, value, branchName, configuration); } commits.Push(commit); @@ -82,7 +82,7 @@ public TrunkBasedCommit CreateCommit( return commit; } - public TrunkBasedCommit? FindCommit(ICommit commit) + public MainlineCommit? FindCommit(ICommit commit) { commit.NotNull(); diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunk.cs similarity index 80% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunk.cs index dea1beb8bc..9b05e8cb88 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunk.cs @@ -1,8 +1,8 @@ using GitVersion.Configuration; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; -internal sealed class CommitOnNonTrunk : ITrunkBasedIncrementer +internal sealed class CommitOnNonTrunk : IIncrementer { // B 57 minutes ago (HEAD -> feature/foo) // A 58 minutes ago <<-- @@ -10,13 +10,13 @@ internal sealed class CommitOnNonTrunk : ITrunkBasedIncrementer // B 57 minutes ago (HEAD -> feature/foo) <<-- // A 58 minutes ago - public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.HasChildIteration && !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && context.SemanticVersion is null; public IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { if (commit.Predecessor is not null && commit.Predecessor.BranchName != commit.BranchName) context.Label = null; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedBase.cs similarity index 78% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedBase.cs index 2fce545d32..b926b41957 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedBase.cs @@ -1,17 +1,17 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; -internal abstract class CommitOnNonTrunkBranchedBase : ITrunkBasedIncrementer +internal abstract class CommitOnNonTrunkBranchedBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && commit.BranchName != iteration.BranchName && commit.Successor is null; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs similarity index 74% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs index c870cd297c..265a0682e1 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToNonTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class CommitOnNonTrunkBranchedToNonTrunk : CommitOnNonTrunkBranchedBase { @@ -13,7 +13,7 @@ internal sealed class CommitOnNonTrunkBranchedToNonTrunk : CommitOnNonTrunkBranc // |/ // A 58 minutes ago <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && !iteration.GetEffectiveConfiguration(context.Configuration).IsMainBranch; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs similarity index 74% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs index 22ff874504..0b69a31024 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkBranchedToTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class CommitOnNonTrunkBranchedToTrunk : CommitOnNonTrunkBranchedBase { @@ -13,7 +13,7 @@ internal sealed class CommitOnNonTrunkBranchedToTrunk : CommitOnNonTrunkBranched // |/ // A 58 minutes ago <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && iteration.GetEffectiveConfiguration(context.Configuration).IsMainBranch; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs similarity index 60% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs index 53d048c5d5..d829bdec15 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTag.cs @@ -1,10 +1,10 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class CommitOnNonTrunkWithPreReleaseTag : CommitOnNonTrunkWithPreReleaseTagBase { // B 57 minutes ago (HEAD -> feature/foo) // A 58 minutes ago (tag 1.2.3-1) <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs similarity index 76% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs index ba31a411b7..d3cb4690fd 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs @@ -1,17 +1,17 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; -internal abstract class CommitOnNonTrunkWithPreReleaseTagBase : ITrunkBasedIncrementer +internal abstract class CommitOnNonTrunkWithPreReleaseTagBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.HasChildIteration && !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && context.SemanticVersion?.IsPreRelease == true; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTag.cs similarity index 59% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTag.cs index bca6c7e7bd..ec2fdae507 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTag.cs @@ -1,10 +1,10 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class CommitOnNonTrunkWithStableTag : CommitOnNonTrunkWithStableTagBase { // B 57 minutes ago (HEAD -> feature/foo) // A 58 minutes ago (tag 1.2.3) <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs similarity index 71% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs index 65be56f8ec..89b7ef9f5d 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs @@ -1,17 +1,17 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; -internal abstract class CommitOnNonTrunkWithStableTagBase : ITrunkBasedIncrementer +internal abstract class CommitOnNonTrunkWithStableTagBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && !commit.HasChildIteration && context.SemanticVersion?.IsPreRelease == false; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/FirstCommitOnRelease.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs similarity index 80% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/FirstCommitOnRelease.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs index 94c7803fd0..d6a7d8d97c 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/FirstCommitOnRelease.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs @@ -1,13 +1,13 @@ using GitVersion.Configuration; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; /// /// This incrementer identifies the first commit on a branch marked with IsReleaseBranch true and appends the version number for /// instance 1.0.0 (extracted from the branch name) as an alternative semantic version to the context. This information will be /// used later to bump the version number to a higher value if necessary. /// -internal sealed class FirstCommitOnRelease : ITrunkBasedIncrementer +internal sealed class FirstCommitOnRelease : IIncrementer { // B 57 minutes ago (HEAD -> release/1.0.0) // A 58 minutes ago <<-- @@ -18,7 +18,7 @@ internal sealed class FirstCommitOnRelease : ITrunkBasedIncrementer // B 57 minutes ago <<-- // A 58 minutes ago (main) - public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.HasChildIteration && !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && commit.GetEffectiveConfiguration(context.Configuration).IsReleaseBranch @@ -27,7 +27,7 @@ public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit co || commit.BranchName != commit.Predecessor?.BranchName); public IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { var effectiveConfiguration = commit.GetEffectiveConfiguration(context.Configuration); if (commit.BranchName.TryGetSemanticVersion(out var element, effectiveConfiguration)) diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs similarity index 75% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs index 151d56927f..3316057741 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithPreReleaseTag.cs @@ -1,15 +1,15 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class LastCommitOnNonTrunkWithPreReleaseTag : CommitOnNonTrunkWithPreReleaseTagBase { // B 57 minutes ago (HEAD -> feature/foo) (tag 1.2.3-1) <<-- // A 58 minutes ago - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; public override IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { foreach (var item in base.GetIncrements(iteration, commit, context)) { diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs similarity index 75% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs index b581a4342d..c9fbed2946 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastCommitOnNonTrunkWithStableTag.cs @@ -1,15 +1,15 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class LastCommitOnNonTrunkWithStableTag : CommitOnNonTrunkWithStableTagBase { // B 57 minutes ago (HEAD -> feature/foo) (tag 1.2.3) <<-- // A 58 minutes ago - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; public override IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { foreach (var item in base.GetIncrements(iteration, commit, context)) { diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastMergeCommitOnNonTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastMergeCommitOnNonTrunk.cs similarity index 76% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastMergeCommitOnNonTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastMergeCommitOnNonTrunk.cs index a25c69e7a4..960b7c8002 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/LastMergeCommitOnNonTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/LastMergeCommitOnNonTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class LastMergeCommitOnNonTrunk : MergeCommitOnNonTrunkBase { @@ -6,11 +6,11 @@ internal sealed class LastMergeCommitOnNonTrunk : MergeCommitOnNonTrunkBase // |\ // | B 56 minutes ago (feature/foo) - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; public override IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { foreach (var item in base.GetIncrements(iteration, commit, context)) { diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunk.cs similarity index 61% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunk.cs index b64f5b903f..8fca598267 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; internal sealed class MergeCommitOnNonTrunk : MergeCommitOnNonTrunkBase { @@ -7,6 +7,6 @@ internal sealed class MergeCommitOnNonTrunk : MergeCommitOnNonTrunkBase // |\ // | B 56 minutes ago (feature/foo) - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunkBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunkBase.cs similarity index 82% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunkBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunkBase.cs index 1479cb33cb..18b41fe1e0 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunkBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/MergeCommitOnNonTrunkBase.cs @@ -1,20 +1,20 @@ using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk; +namespace GitVersion.VersionCalculation.Mainline.NonTrunk; -internal abstract class MergeCommitOnNonTrunkBase : ITrunkBasedIncrementer +internal abstract class MergeCommitOnNonTrunkBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => commit.HasChildIteration && !commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && context.SemanticVersion is null; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { if (commit.ChildIteration is null) throw new InvalidOperationException("The commit child iteration is null."); - var baseVersion = TrunkBasedVersionStrategy.DetermineBaseVersionRecursive( + var baseVersion = MainlineVersionStrategy.DetermineBaseVersionRecursive( iteration: commit.ChildIteration, targetLabel: context.TargetLabel, incrementStrategyFinder: context.IncrementStrategyFinder, diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveIncrement.cs b/src/GitVersion.Core/VersionCalculation/Mainline/RemoveIncrement.cs similarity index 53% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveIncrement.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/RemoveIncrement.cs index 8e22515998..cc2687f28e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveIncrement.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/RemoveIncrement.cs @@ -1,8 +1,8 @@ -namespace GitVersion.VersionCalculation.TrunkBased; +namespace GitVersion.VersionCalculation.Mainline; -internal sealed class RemoveIncrement : ITrunkBasedContextPostEnricher +internal sealed class RemoveIncrement : IContextPostEnricher { - public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { if (commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch) { diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/RemoveSemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/Mainline/RemoveSemanticVersion.cs new file mode 100644 index 0000000000..802a15f491 --- /dev/null +++ b/src/GitVersion.Core/VersionCalculation/Mainline/RemoveSemanticVersion.cs @@ -0,0 +1,6 @@ +namespace GitVersion.VersionCalculation.Mainline; + +internal sealed class RemoveSemanticVersion : IContextPostEnricher +{ + public void Enrich(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => context.SemanticVersion = null; +} diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunk.cs similarity index 78% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunk.cs index d06c22f112..ad49fb058e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunk.cs @@ -1,8 +1,8 @@ using GitVersion.Configuration; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; -internal sealed class CommitOnTrunk : ITrunkBasedIncrementer +internal sealed class CommitOnTrunk : IIncrementer { // B 57 minutes ago (HEAD -> main) <<-- // A 58 minutes ago @@ -10,12 +10,12 @@ internal sealed class CommitOnTrunk : ITrunkBasedIncrementer // B 57 minutes ago (HEAD -> main) // A 58 minutes ago <<-- - public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => !commit.HasChildIteration && commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && context.SemanticVersion is null; public IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { if (commit.Predecessor is not null && commit.Predecessor.BranchName != commit.BranchName) context.Label = null; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs similarity index 82% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs index ed2a4831e1..c56cdea82e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs @@ -1,17 +1,17 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; -internal abstract class CommitOnTrunkBranchedBase : ITrunkBasedIncrementer +internal abstract class CommitOnTrunkBranchedBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && commit.BranchName != iteration.BranchName && commit.Successor is null; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToNonTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToNonTrunk.cs similarity index 74% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToNonTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToNonTrunk.cs index cc71df969a..9ad2d1664e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToNonTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToNonTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class CommitOnTrunkBranchedToNonTrunk : CommitOnTrunkBranchedBase { @@ -13,7 +13,7 @@ internal sealed class CommitOnTrunkBranchedToNonTrunk : CommitOnTrunkBranchedBas // |/ // A 58 minutes ago <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && !iteration.GetEffectiveConfiguration(context.Configuration).IsMainBranch; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToTrunk.cs similarity index 74% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToTrunk.cs index 059fe28941..2963a6e01e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkBranchedToTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedToTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class CommitOnTrunkBranchedToTrunk : CommitOnTrunkBranchedBase { @@ -13,7 +13,7 @@ internal sealed class CommitOnTrunkBranchedToTrunk : CommitOnTrunkBranchedBase // |/ // A 58 minutes ago <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && iteration.GetEffectiveConfiguration(context.Configuration).IsMainBranch; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTag.cs similarity index 59% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTag.cs index 42f1dd1aac..41a4d56f2a 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTag.cs @@ -1,10 +1,10 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class CommitOnTrunkWithPreReleaseTag : CommitOnTrunkWithPreReleaseTagBase { // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.2.0-1) <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs similarity index 61% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs index 3168ed4518..27e63c5205 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs @@ -1,15 +1,15 @@ using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; -internal abstract class CommitOnTrunkWithPreReleaseTagBase : ITrunkBasedIncrementer +internal abstract class CommitOnTrunkWithPreReleaseTagBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && !commit.HasChildIteration && context.SemanticVersion?.IsPreRelease == true; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTag.cs similarity index 59% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTag.cs index ed2ed6634a..c75a6d2f60 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTag.cs @@ -1,10 +1,10 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class CommitOnTrunkWithStableTag : CommitOnTrunkWithStableTagBase { // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.2.0) <<-- - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTagBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTagBase.cs similarity index 69% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTagBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTagBase.cs index b96aa7097d..bd1eae48d2 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTagBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkWithStableTagBase.cs @@ -1,16 +1,16 @@ using GitVersion.Configuration; using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; -internal abstract class CommitOnTrunkWithStableTagBase : ITrunkBasedIncrementer +internal abstract class CommitOnTrunkWithStableTagBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && !commit.HasChildIteration && context.SemanticVersion?.IsPreRelease == false; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { context.BaseVersionSource = commit.Value; diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs similarity index 83% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs index 91e8407ce5..7612974e9e 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithPreReleaseTag.cs @@ -1,17 +1,17 @@ using GitVersion.Configuration; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class LastCommitOnTrunkWithPreReleaseTag : CommitOnTrunkWithPreReleaseTagBase { // B 58 minutes ago (HEAD -> main) (tag 0.2.0-1) <<-- // A 59 minutes ago - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; public override IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { foreach (var item in base.GetIncrements(iteration, commit, context)) { diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithStableTag.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithStableTag.cs similarity index 79% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithStableTag.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithStableTag.cs index 16e32a59a6..525ee1f6b5 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastCommitOnTrunkWithStableTag.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastCommitOnTrunkWithStableTag.cs @@ -1,15 +1,15 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class LastCommitOnTrunkWithStableTag : CommitOnTrunkWithStableTagBase { // B 58 minutes ago (HEAD -> main) (tag 0.2.0) <<-- // A 59 minutes ago - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; public override IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { foreach (var item in base.GetIncrements(iteration, commit, context)) { diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastMergeCommitOnTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastMergeCommitOnTrunk.cs similarity index 59% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastMergeCommitOnTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastMergeCommitOnTrunk.cs index d18db2846c..54d034fda9 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/LastMergeCommitOnTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/LastMergeCommitOnTrunk.cs @@ -1,5 +1,5 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class LastMergeCommitOnTrunk : MergeCommitOnTrunkBase { @@ -7,6 +7,6 @@ internal sealed class LastMergeCommitOnTrunk : MergeCommitOnTrunkBase // |\ // | B 56 minutes ago (feature/foo) - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunk.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunk.cs similarity index 61% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunk.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunk.cs index 3275c36206..eafd1086a3 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunk.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunk.cs @@ -1,4 +1,4 @@ -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; internal sealed class MergeCommitOnTrunk : MergeCommitOnTrunkBase { @@ -7,6 +7,6 @@ internal sealed class MergeCommitOnTrunk : MergeCommitOnTrunkBase // |\ // | B 56 minutes ago (feature/foo) - public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public override bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null; } diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunkBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunkBase.cs similarity index 85% rename from src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunkBase.cs rename to src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunkBase.cs index d9d6ecaad8..f731d26a7d 100644 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunkBase.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/MergeCommitOnTrunkBase.cs @@ -1,18 +1,18 @@ using GitVersion.Extensions; -namespace GitVersion.VersionCalculation.TrunkBased.Trunk; +namespace GitVersion.VersionCalculation.Mainline.Trunk; -internal abstract class MergeCommitOnTrunkBase : ITrunkBasedIncrementer +internal abstract class MergeCommitOnTrunkBase : IIncrementer { - public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + public virtual bool MatchPrecondition(MainlineIteration iteration, MainlineCommit commit, MainlineContext context) => commit.HasChildIteration && commit.GetEffectiveConfiguration(context.Configuration).IsMainBranch && context.SemanticVersion is null; public virtual IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) + MainlineIteration iteration, MainlineCommit commit, MainlineContext context) { if (commit.ChildIteration is null) throw new InvalidOperationException("The commit child iteration is null."); - var baseVersion = TrunkBasedVersionStrategy.DetermineBaseVersionRecursive( + var baseVersion = MainlineVersionStrategy.DetermineBaseVersionRecursive( iteration: commit.ChildIteration!, targetLabel: context.TargetLabel, incrementStrategyFinder: context.IncrementStrategyFinder, diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPostEnricher.cs b/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPostEnricher.cs deleted file mode 100644 index 0647d62245..0000000000 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPostEnricher.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace GitVersion.VersionCalculation.TrunkBased; - -internal interface ITrunkBasedContextPostEnricher -{ - void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context); -} diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPreEnricher.cs b/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPreEnricher.cs deleted file mode 100644 index 7e0eb36442..0000000000 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedContextPreEnricher.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace GitVersion.VersionCalculation.TrunkBased; - -internal interface ITrunkBasedContextPreEnricher -{ - void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context); -} diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedIncrementer.cs b/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedIncrementer.cs deleted file mode 100644 index 5c8141e2ad..0000000000 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/ITrunkBasedIncrementer.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace GitVersion.VersionCalculation.TrunkBased; - -internal interface ITrunkBasedIncrementer -{ - bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context); - - IEnumerable GetIncrements( - TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context); -} diff --git a/src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveSemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveSemanticVersion.cs deleted file mode 100644 index 0c53022632..0000000000 --- a/src/GitVersion.Core/VersionCalculation/TrunkBased/RemoveSemanticVersion.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace GitVersion.VersionCalculation.TrunkBased; - -internal sealed class RemoveSemanticVersion : ITrunkBasedContextPostEnricher -{ - public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context) => context.SemanticVersion = null; -} diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs similarity index 92% rename from src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs rename to src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs index f42c869d90..85f0dbab69 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs @@ -3,13 +3,13 @@ using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; -using GitVersion.VersionCalculation.TrunkBased; -using GitVersion.VersionCalculation.TrunkBased.NonTrunk; -using GitVersion.VersionCalculation.TrunkBased.Trunk; +using GitVersion.VersionCalculation.Mainline; +using GitVersion.VersionCalculation.Mainline.NonTrunk; +using GitVersion.VersionCalculation.Mainline.Trunk; namespace GitVersion.VersionCalculation; -internal sealed class TrunkBasedVersionStrategy( +internal sealed class MainlineVersionStrategy( Lazy contextLazy, IRepositoryStore repositoryStore, ITaggedSemanticVersionService taggedSemanticVersionService, @@ -24,17 +24,17 @@ internal sealed class TrunkBasedVersionStrategy( private GitVersionContext Context => contextLazy.Value; - private static readonly IReadOnlyCollection TrunkContextPreEnricherCollection = + private static readonly IReadOnlyCollection TrunkContextPreEnricherCollection = [ new EnrichSemanticVersion(), new EnrichIncrement() ]; - private static readonly IReadOnlyCollection TrunkContextPostEnricherCollection = + private static readonly IReadOnlyCollection TrunkContextPostEnricherCollection = [ new RemoveSemanticVersion(), new RemoveIncrement() ]; - private static readonly IReadOnlyCollection TrunkIncrementerCollection = + private static readonly IReadOnlyCollection TrunkIncrementerCollection = [ // Trunk new CommitOnTrunk(), @@ -72,7 +72,7 @@ public IEnumerable GetBaseVersions(EffectiveBranchConfiguration con { configuration.NotNull(); - if (!Context.Configuration.VersionStrategy.HasFlag(VersionStrategies.TrunkBased)) + if (!Context.Configuration.VersionStrategy.HasFlag(VersionStrategies.Mainline)) yield break; var branchConfiguration = Context.Configuration.GetBranchConfiguration(Context.CurrentBranch); @@ -113,12 +113,12 @@ public IEnumerable GetBaseVersions(EffectiveBranchConfiguration con yield return DetermineBaseVersion(iteration, targetLabel, incrementStrategyFinder, Context.Configuration); } - private TrunkBasedIteration CreateIteration( + private MainlineIteration CreateIteration( ReferenceName branchName, IBranchConfiguration configuration, - TrunkBasedIteration? parentIteration = null, TrunkBasedCommit? parentCommit = null) + MainlineIteration? parentIteration = null, MainlineCommit? parentCommit = null) { var iterationCount = Interlocked.Increment(ref iterationCounter); - return new TrunkBasedIteration( + return new MainlineIteration( id: $"#{iterationCount}", branchName: branchName, configuration: configuration, @@ -128,7 +128,7 @@ private TrunkBasedIteration CreateIteration( } private bool IterateOverCommitsRecursive( - IEnumerable commitsInReverseOrder, TrunkBasedIteration iteration, IBranch targetBranch, string? targetLabel, + IEnumerable commitsInReverseOrder, MainlineIteration iteration, IBranch targetBranch, string? targetLabel, ILookup taggedSemanticVersions, HashSet? traversedCommits = null) { traversedCommits ??= []; @@ -323,11 +323,11 @@ private bool IterateOverCommitsRecursive( return result; } - private static BaseVersion DetermineBaseVersion(TrunkBasedIteration iteration, string? targetLabel, + private static BaseVersion DetermineBaseVersion(MainlineIteration iteration, string? targetLabel, IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration) => DetermineBaseVersionRecursive(iteration, targetLabel, incrementStrategyFinder, configuration); - internal static BaseVersion DetermineBaseVersionRecursive(TrunkBasedIteration iteration, string? targetLabel, + internal static BaseVersion DetermineBaseVersionRecursive(MainlineIteration iteration, string? targetLabel, IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration) { iteration.NotNull(); @@ -354,10 +354,10 @@ internal static BaseVersion DetermineBaseVersionRecursive(TrunkBasedIteration it return result ?? throw new InvalidOperationException(); } - private static IEnumerable GetIncrements(TrunkBasedIteration iteration, string? targetLabel, + private static IEnumerable GetIncrements(MainlineIteration iteration, string? targetLabel, IIncrementStrategyFinder incrementStrategyFinder, IGitVersionConfiguration configuration) { - TrunkBasedContext context = new(incrementStrategyFinder, configuration) + MainlineContext context = new(incrementStrategyFinder, configuration) { TargetLabel = targetLabel }; diff --git a/src/GitVersion.Core/VersionCalculation/VersionStrategies.cs b/src/GitVersion.Core/VersionCalculation/VersionStrategies.cs index 5810de0df5..4fe020c87a 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionStrategies.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionStrategies.cs @@ -10,5 +10,5 @@ public enum VersionStrategies TaggedCommit = 8, TrackReleaseBranches = 16, VersionInBranchName = 32, - TrunkBased = 64 + Mainline = 64 }