Hide Cache and call GetOrAddCachedRegex instead.

Author: 9swampy

src/GitVersion.Core/Configuration/IBranchConfiguration.cs

@@ -29,7 +29,7 @@ bool IsMatch(string branchName)
             return false;
         }
 
-        var regex = RegexPatterns.Cache.GetOrAdd(RegularExpression);
+        var regex = RegexPatterns.GetOrAddCachedRegex(RegularExpression);
         return regex.IsMatch(branchName);
     }
 

src/GitVersion.Core/Configuration/ReferenceNameExtensions.cs

@@ -17,7 +17,7 @@ private static bool TryGetSemanticVersion(this ReferenceName referenceName, out
                                               string? tagPrefix,
                                               SemanticVersionFormat format)
     {
-        var versionPatternRegex = RegexPatterns.Cache.GetOrAdd(GetVersionInBranchPattern(versionPatternPattern));
+        var versionPatternRegex = RegexPatterns.GetOrAddCachedRegex(GetVersionInBranchPattern(versionPatternPattern));
         result = default;
 
         var length = 0;

src/GitVersion.Core/Core/RegexPatterns.cs

@@ -5,9 +5,9 @@ namespace GitVersion.Core;
 
 internal static partial class RegexPatterns
 {
-    internal static readonly ConcurrentDictionary<string, Regex> Cache = new();
+    private static readonly ConcurrentDictionary<string, Regex> Cache = new();
 
-    public static Regex GetRegex(string pattern) => Cache.GetOrAdd(
+    public static Regex GetOrAddCachedRegex(string pattern) => Cache.GetOrAdd(
         pattern,
         _ => pattern switch
         {

src/GitVersion.Core/Core/SourceBranchFinder.cs

@@ -36,7 +36,7 @@ private static IEnumerable<Regex> GetSourceBranchRegexes(INamedReference branch,
             var currentBranchConfig = configuration.GetBranchConfiguration(branch.Name);
             if (currentBranchConfig is { SourceBranches: null })
             {
-                yield return RegexPatterns.Cache.GetOrAdd(".*");
+                yield return RegexPatterns.GetOrAddCachedRegex(".*");
             }
             else
             {
@@ -45,7 +45,7 @@ private static IEnumerable<Regex> GetSourceBranchRegexes(INamedReference branch,
                 {
                     var regex = branches[sourceBranch].RegularExpression;
                     if (regex != null)
-                        yield return RegexPatterns.Cache.GetOrAdd(regex);
+                        yield return RegexPatterns.GetOrAddCachedRegex(regex);
                 }
             }
         }

src/GitVersion.Core/Extensions/ConfigurationExtensions.cs

@@ -90,7 +90,7 @@ public static bool IsReleaseBranch(this IGitVersionConfiguration configuration,
 
         var effectiveBranchName = branchNameOverride ?? branchName;
         if (configuration.RegularExpression.IsNullOrWhiteSpace() || effectiveBranchName.IsNullOrEmpty()) return label;
-        var regex = RegexPatterns.Cache.GetOrAdd(configuration.RegularExpression);
+        var regex = RegexPatterns.GetOrAddCachedRegex(configuration.RegularExpression);
         var match = regex.Match(effectiveBranchName);
         if (!match.Success) return label;
         foreach (var groupName in regex.GetGroupNames())

src/GitVersion.Core/Extensions/StringExtensions.cs

@@ -13,7 +13,7 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for
 
     public static string RegexReplace(this string input, string pattern, string replace)
     {
-        var regex = RegexPatterns.Cache.GetOrAdd(pattern);
+        var regex = RegexPatterns.GetOrAddCachedRegex(pattern);
         return regex.Replace(input, replace);
     }
 

src/GitVersion.Core/MergeMessage.cs

@@ -30,7 +30,7 @@ public MergeMessage(string mergeMessage, IGitVersionConfiguration configuration)
         // Concatenate configuration formats with the defaults.
         // Ensure configurations are processed first.
         var allFormats = configuration.MergeMessageFormats
-            .Select(x => (Name: x.Key, Pattern: RegexPatterns.Cache.GetOrAdd(x.Value)))
+            .Select(x => (Name: x.Key, Pattern: RegexPatterns.GetOrAddCachedRegex(x.Value)))
             .Concat(DefaultFormats);
 
         foreach (var (Name, Pattern) in allFormats)

src/GitVersion.Core/SemVer/SemanticVersion.cs

@@ -132,7 +132,7 @@ public static SemanticVersion Parse(
     public static bool TryParse(string version, string? tagPrefixRegex,
         [NotNullWhen(true)] out SemanticVersion? semanticVersion, SemanticVersionFormat format = SemanticVersionFormat.Strict)
     {
-        var regex = RegexPatterns.Cache.GetOrAdd($"^({tagPrefixRegex})(?<version>.*)$");
+        var regex = RegexPatterns.GetOrAddCachedRegex($"^({tagPrefixRegex})(?<version>.*)$");
         var match = regex.Match(version);
 
         if (!match.Success)

src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs

@@ -92,7 +92,7 @@ public VersionField DetermineIncrementedField(
     private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex) =>
         messageRegex == null
             ? defaultRegex
-            : RegexPatterns.Cache.GetOrAdd(messageRegex);
+            : RegexPatterns.GetOrAddCachedRegex(messageRegex);
 
     private Dictionary<string, ICommit>.ValueCollection GetCommitHistory(string? tagPrefix, SemanticVersionFormat semanticVersionFormat,
         ICommit? baseVersionSource, ICommit currentCommit, string? label, IIgnoreConfiguration ignore)