Tidy up RegexPatterns.Cache and proliferate [StringSyntax(StringSyntaxAttribute.Regex)] appropriately.

Author: 9swampy

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.Core/Configuration/EffectiveConfiguration.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
 
@@ -100,6 +101,7 @@ public EffectiveConfiguration(
 
     public IncrementStrategy Increment { get; }
 
+    [StringSyntax(StringSyntaxAttribute.Regex)]
     public string? RegularExpression { get; }
 
     public bool PreventIncrementOfMergedBranch { get; }

src/GitVersion.Core/Configuration/IBranchConfiguration.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using GitVersion.Core;
 using GitVersion.VersionCalculation;
 
@@ -19,6 +20,7 @@ public interface IBranchConfiguration
 
     CommitMessageIncrementMode? CommitMessageIncrementing { get; }
 
+    [StringSyntax(StringSyntaxAttribute.Regex)]
     string? RegularExpression { get; }
 
     bool IsMatch(string branchName)

src/GitVersion.Core/Core/RegexPatterns.cs

@@ -13,15 +13,14 @@ public static class Cache
     {
         private static readonly ConcurrentDictionary<string, Regex> cache = new();
 
-        public static Regex GetOrAdd(string pattern) =>
-            GetOrAdd(pattern, () => new Regex(pattern, Options));
-
-        public static Regex GetOrAdd(string pattern, Func<Regex> fallbackFactory)
+        public static Regex GetOrAdd([StringSyntax(StringSyntaxAttribute.Regex)] string pattern)
         {
             ArgumentNullException.ThrowIfNull(pattern);
-            ArgumentNullException.ThrowIfNull(fallbackFactory);
 
-            return cache.GetOrAdd(pattern, _ => Resolve(pattern, fallbackFactory));
+            return cache.GetOrAdd(pattern, key =>
+                KnownRegexes.TryGetValue(key, out var factory)
+                    ? factory()
+                    : new Regex(key, Options));
         }
 
         private static readonly ImmutableDictionary<string, Func<Regex>> KnownRegexes =
@@ -71,16 +70,6 @@ public static Regex GetOrAdd(string pattern, Func<Regex> fallbackFactory)
                 [AssemblyVersion.VisualBasic.TriviaRegexPattern] = AssemblyVersion.VisualBasic.TriviaRegex,
                 [AssemblyVersion.VisualBasic.AttributeRegexPattern] = AssemblyVersion.VisualBasic.AttributeRegex
             }.ToImmutableDictionary();
-
-        private static Regex Resolve(string pattern, Func<Regex> fallbackFactory)
-        {
-            if (KnownRegexes.TryGetValue(pattern, out var factory))
-            {
-                return factory();
-            }
-
-            return fallbackFactory();
-        }
     }
 
     internal static partial class Common

src/GitVersion.Core/Extensions/DictionaryExtensions.cs

@@ -1,12 +1,8 @@
-using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.RegularExpressions;
-
 namespace GitVersion.Extensions;
 
-public static class DictionaryExtensions
+internal static class DictionaryExtensions
 {
-    public static TValue GetOrAdd<TKey, TValue>(this Dictionary<TKey, TValue> dict, TKey key, Func<TValue> getValue) where TKey : notnull
+    internal static TValue GetOrAdd<TKey, TValue>(this Dictionary<TKey, TValue> dict, TKey key, Func<TValue> getValue) where TKey : notnull
     {
         ArgumentNullException.ThrowIfNull(dict);
         ArgumentNullException.ThrowIfNull(getValue);
@@ -16,12 +12,4 @@ public static TValue GetOrAdd<TKey, TValue>(this Dictionary<TKey, TValue> dict,
         dict.Add(key, value);
         return value;
     }
-
-    public static Regex GetOrAdd(this ConcurrentDictionary<string, Regex> dict, [StringSyntax(StringSyntaxAttribute.Regex)] string pattern)
-    {
-        ArgumentNullException.ThrowIfNull(dict);
-        ArgumentNullException.ThrowIfNull(pattern);
-
-        return dict.GetOrAdd(pattern, regex => new(regex, RegexOptions.IgnoreCase | RegexOptions.Compiled));
-    }
 }

src/GitVersion.Core/PublicAPI.Shipped.txt

@@ -154,7 +154,6 @@ GitVersion.ConfigurationInfo.OverrideConfiguration -> System.Collections.Generic
 GitVersion.ConfigurationInfo.ShowConfiguration -> bool
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions
 GitVersion.Extensions.CommonExtensions
-GitVersion.Extensions.DictionaryExtensions
 GitVersion.Extensions.EnumerableExtensions
 GitVersion.Extensions.FileSystemExtensions
 GitVersion.Extensions.GitExtensions
@@ -730,8 +729,6 @@ static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyVers
 static GitVersion.Extensions.CommonExtensions.NotNull<T>(this T? value, string! name = "") -> T!
 static GitVersion.Extensions.CommonExtensions.NotNullOrEmpty(this string? value, string! name = "") -> string!
 static GitVersion.Extensions.CommonExtensions.NotNullOrWhitespace(this string? value, string! name = "") -> string!
-static GitVersion.Extensions.DictionaryExtensions.GetOrAdd(this System.Collections.Concurrent.ConcurrentDictionary<string!, System.Text.RegularExpressions.Regex!>! dict, string! pattern) -> System.Text.RegularExpressions.Regex!
-static GitVersion.Extensions.DictionaryExtensions.GetOrAdd<TKey, TValue>(this System.Collections.Generic.Dictionary<TKey, TValue>! dict, TKey key, System.Func<TValue>! getValue) -> TValue
 static GitVersion.Extensions.EnumerableExtensions.AddRange<T>(this System.Collections.Generic.ICollection<T>! source, System.Collections.Generic.IEnumerable<T>! items) -> void
 static GitVersion.Extensions.EnumerableExtensions.OnlyOrDefault<T>(this System.Collections.Generic.IEnumerable<T>! source) -> T?
 static GitVersion.Extensions.EnumerableExtensions.SingleOfType<T>(this System.Collections.IEnumerable! source) -> T