Merge pull request #4595 from 9swampy/ConvertRegexes

Convert to GeneratedRegexes

Author: arturcic

src/GitVersion.App/ArgumentParserExtensions.cs

@@ -40,7 +40,7 @@ public static bool IsValidPath(this string? path)
 
     public static bool IsSwitchArgument(this string? value)
     {
-        var patternRegex = RegexPatterns.Common.SwitchArgumentRegex;
+        var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
         return value != null
                && (value.StartsWith('-') || value.StartsWith('/'))
                && !patternRegex.Match(value).Success;

src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs

@@ -258,7 +258,7 @@ public void CanReadDefaultDocument()
         configuration.AssemblyInformationalFormat.ShouldBe(null);
         configuration.Branches["develop"].Label.ShouldBe("alpha");
         configuration.Branches["release"].Label.ShouldBe("beta");
-        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixPattern);
+        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixRegexPattern);
         configuration.NextVersion.ShouldBe(null);
     }
 
@@ -418,7 +418,7 @@ public void ShouldUseDefaultTagPrefixWhenNotSetInConfigFile()
         using var _ = this.fileSystem.SetupConfigFile(path: this.repoPath, text: text);
         var configuration = this.configurationProvider.ProvideForDirectory(this.repoPath);
 
-        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixPattern);
+        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixRegexPattern);
     }
 
     [Test]
@@ -457,7 +457,7 @@ public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()
 
         var configuration = this.configurationProvider.ProvideForDirectory(this.repoPath, overrideConfiguration);
 
-        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixPattern);
+        configuration.TagPrefixPattern.ShouldBe(RegexPatterns.Configuration.DefaultTagPrefixRegexPattern);
     }
 
     [Test]

src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
@@ -81,7 +82,7 @@ public virtual BranchConfigurationBuilder WithCommitMessageIncrementing(CommitMe
         return this;
     }
 
-    public virtual BranchConfigurationBuilder WithRegularExpression(string? value)
+    public virtual BranchConfigurationBuilder WithRegularExpression([StringSyntax(StringSyntaxAttribute.Regex)] string? value)
     {
         this.regularExpression = value;
         return this;

src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs

@@ -14,14 +14,14 @@ private GitFlowConfigurationBuilder()
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
-            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
-            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorRegexPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorRegexPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpRegexPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchRegexPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = ConfigurationConstants.DefaultVersionStrategies,
-            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixPattern,
-            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchPattern,
+            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixRegexPattern,
+            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern,
             TagPreReleaseWeight = ConfigurationConstants.DefaultTagPreReleaseWeight,
             UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber,
             DeploymentMode = DeploymentMode.ContinuousDelivery,

src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs

@@ -14,14 +14,14 @@ private GitHubFlowConfigurationBuilder()
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
-            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
-            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorRegexPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorRegexPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpRegexPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchRegexPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = ConfigurationConstants.DefaultVersionStrategies,
-            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixPattern,
-            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchPattern,
+            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixRegexPattern,
+            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern,
             TagPreReleaseWeight = ConfigurationConstants.DefaultTagPreReleaseWeight,
             UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber,
             DeploymentMode = DeploymentMode.ContinuousDelivery,

src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs

@@ -14,17 +14,17 @@ private TrunkBasedConfigurationBuilder()
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
-            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
-            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorRegexPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorRegexPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpRegexPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchRegexPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = [
                 VersionStrategies.ConfiguredNextVersion,
                 VersionStrategies.Mainline
             ],
-            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixPattern,
-            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchPattern,
+            TagPrefixPattern = RegexPatterns.Configuration.DefaultTagPrefixRegexPattern,
+            VersionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern,
             TagPreReleaseWeight = ConfigurationConstants.DefaultTagPreReleaseWeight,
             UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber,
             DeploymentMode = DeploymentMode.ContinuousDelivery,

src/GitVersion.Configuration/GitVersionConfiguration.cs

@@ -36,14 +36,14 @@ internal sealed record GitVersionConfiguration : BranchConfiguration, IGitVersio
     public string? AssemblyFileVersioningFormat { get; internal init; }
 
     [JsonPropertyName("tag-prefix")]
-    [JsonPropertyDescription($"A regular expression which is used to trim Git tags before processing. Defaults to '{RegexPatterns.Configuration.DefaultTagPrefixPattern}'")]
-    [JsonPropertyDefault(RegexPatterns.Configuration.DefaultTagPrefixPattern)]
+    [JsonPropertyDescription($"A regular expression which is used to trim Git tags before processing. Defaults to '{RegexPatterns.Configuration.DefaultTagPrefixRegexPattern}'")]
+    [JsonPropertyDefault(RegexPatterns.Configuration.DefaultTagPrefixRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? TagPrefixPattern { get; internal init; }
 
     [JsonPropertyName("version-in-branch-pattern")]
-    [JsonPropertyDescription($"A regular expression which is used to determine the version number in the branch name or commit message (e.g., v1.0.0-LTS). Defaults to '{RegexPatterns.Configuration.DefaultVersionInBranchPattern}'.")]
-    [JsonPropertyDefault(RegexPatterns.Configuration.DefaultVersionInBranchPattern)]
+    [JsonPropertyDescription($"A regular expression which is used to determine the version number in the branch name or commit message (e.g., v1.0.0-LTS). Defaults to '{RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern}'.")]
+    [JsonPropertyDefault(RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? VersionInBranchPattern { get; internal init; }
 
@@ -60,26 +60,26 @@ public string? NextVersion
     private string? nextVersion;
 
     [JsonPropertyName("major-version-bump-message")]
-    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a major version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultMajorPattern}'")]
-    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultMajorPattern)]
+    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a major version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultMajorRegexPattern}'")]
+    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultMajorRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? MajorVersionBumpMessage { get; internal init; }
 
     [JsonPropertyName("minor-version-bump-message")]
-    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a minor version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultMinorPattern}'")]
-    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultMinorPattern)]
+    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a minor version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultMinorRegexPattern}'")]
+    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultMinorRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? MinorVersionBumpMessage { get; internal init; }
 
     [JsonPropertyName("patch-version-bump-message")]
-    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a patch version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultPatchPattern}'")]
-    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultPatchPattern)]
+    [JsonPropertyDescription($"The regular expression to match commit messages with to perform a patch version increment. Defaults to '{RegexPatterns.VersionCalculation.DefaultPatchRegexPattern}'")]
+    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultPatchRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? PatchVersionBumpMessage { get; internal init; }
 
     [JsonPropertyName("no-bump-message")]
-    [JsonPropertyDescription($"Used to tell GitVersion not to increment when in Mainline development mode. Defaults to '{RegexPatterns.VersionCalculation.DefaultNoBumpPattern}'")]
-    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultNoBumpPattern)]
+    [JsonPropertyDescription($"Used to tell GitVersion not to increment when in Mainline development mode. Defaults to '{RegexPatterns.VersionCalculation.DefaultNoBumpRegexPattern}'")]
+    [JsonPropertyDefault(RegexPatterns.VersionCalculation.DefaultNoBumpRegexPattern)]
     [JsonPropertyFormat(Format.Regex)]
     public string? NoBumpMessage { get; internal init; }