Update to support net451 and up

Implement changes from #161
ardalis · Jan 18, 2022 · 8306f93 · 8306f93
1 parent 5b762e5
commit 8306f93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/GuardClauses/GuardAgainstInvalidFormatExtensions.cs b/src/GuardClauses/GuardAgainstInvalidFormatExtensions.cs
@@ -18,9 +18,14 @@ public static partial class GuardClauseExtensions
         /// <param name="message">Optional. Custom error message</param>
         /// <returns></returns>
         /// <exception cref="ArgumentException"></exception>
-        public static string InvalidFormat([JetBrainsNotNull] this IGuardClause guardClause, [JetBrainsNotNull] string input, [JetBrainsNotNull][JetBrainsInvokerParameterName] string parameterName, [JetBrainsNotNull][JetBrainsRegexPattern] string regexPattern, string? message = null)
+        public static string InvalidFormat([JetBrainsNotNull] this IGuardClause guardClause,
+            [JetBrainsNotNull] string input,
+            [JetBrainsNotNull][JetBrainsInvokerParameterName] string parameterName,
+            [JetBrainsNotNull][JetBrainsRegexPattern] string regexPattern,
+            string? message = null)
         {
-            if (input != Regex.Match(input, regexPattern).Value)
+            var m = Regex.Match(input, regexPattern);
+            if (!m.Success || input != m.Value)
             {
                 throw new ArgumentException(message ?? $"Input {parameterName} was not in required format", parameterName);
             }

diff --git a/src/GuardClauses/GuardClauses.csproj b/src/GuardClauses/GuardClauses.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40;net60</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net451;net60</TargetFrameworks>
     <PackageId>Ardalis.GuardClauses</PackageId>
     <Title>Ardalis.GuardClauses</Title>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -17,6 +17,7 @@
     Add support for CallerArgumentExpression.
     Reorganize source files.
     Improve support for custom error messages.
+    Ensure InvalidFormat doesn't succeed given an empty string and a RegEx requiring at least one character. #161
     </PackageReleaseNotes>
     <Version>3.3.0</Version>
     <AssemblyName>Ardalis.GuardClauses</AssemblyName>

diff --git a/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs b/test/GuardClauses.UnitTests/GuardAgainstInvalidFormatTests.cs
@@ -24,6 +24,7 @@ public void ReturnsExpectedValueGivenCorrectFormat(string input,string regexPatt
         [InlineData("2GudhUtG", @"[a-fA-F]+")]
         [InlineData("sDHSTRY", @"[A-Z]+")]
         [InlineData("3F498792", @"\d+")]
+        [InlineData("", @"\d+")]
         public void ThrowsGivenGivenIncorrectFormat(string input, string regexPattern)
         {
             Assert.Throws<ArgumentException>(() => Guard.Against.InvalidFormat(input, nameof(input), regexPattern));