Update configuration.md and fix minor code review issues.

GitTools · Feb 22, 2023 · 59c3bd5 · 59c3bd5
1 parent 4ebaf3b
commit 59c3bd5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md
@@ -48,6 +48,10 @@ minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
 no-bump-message: '\+semver:\s?(none|skip)'
 label-pre-release-weight: 60000
+commit-date-format: yyyy-MM-dd
+merge-message-formats: {}
+update-build-number: true
+semantic-version-format: Strict
 branches:
   develop:
     mode: ContinuousDeployment
@@ -154,9 +158,6 @@ branches:
     - support
 ignore:
   sha: []
-commit-date-format: yyyy-MM-dd
-merge-message-formats: {}
-update-build-number: true
 mode: ContinuousDelivery
 label: '{BranchName}'
 increment: Inherit
@@ -167,7 +168,6 @@ regex: ''
 tracks-release-branches: false
 is-release-branch: false
 is-mainline: false
-
 ```
 
 The details of the available options are as follows:

diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -407,7 +407,7 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
                 // merge release into main
                 fixture.Checkout(MainBranch);
                 fixture.MergeNoFF("release/1.0.0");
-                //fixture.AssertFullSemverNew("1.0.1+2", configuration);
+                fixture.AssertFullSemver("1.0.1+2", configuration);
 
                 // create a misnamed feature branch (i.e. it uses the default configuration) from main and verify the version
                 fixture.BranchTo("misnamed");

diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs
@@ -425,8 +425,8 @@ private static void ValidateConfiguration(GitVersionConfiguration configuration)
 
     public record BranchMetaData
     {
-        public string Name { get; set; }
+        public string Name { get; init; }
 
-        public string RegexPattern { get; set; }
+        public string RegexPattern { get; init; }
     }
 }