Add .NET Standard 2.0 target

thomhurst · Dec 20, 2024 · ba75168 · ba75168
1 parent 8664f80
commit ba75168
Show file tree

Hide file tree

Showing 70 changed files with 681 additions and 160 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <!--suppress MsbuildTargetFrameworkTagInspection -->
     <TargetFrameworks Condition="'$(SDK_VERSION)' == 'net8'">net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(SDK_VERSION)' == 'net9'">net8.0;net9.0</TargetFrameworks>
-    
+
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -84,5 +84,5 @@
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)assets/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
-  
-</Project>
+
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,6 +6,7 @@
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="Backport.System.Threading.Lock" Version="3.1.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="C5" Version="3.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="CliWrap" Version="3.7.0" />
     <PackageVersion Include="EnumerableAsyncProcessor" Version="1.4.0" />
@@ -50,6 +51,7 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
     <PackageVersion Include="Testcontainers.PostgreSql" Version="4.1.0" />
     <PackageVersion Include="trxparser" Version="0.5.0" />
     <PackageVersion Include="TUnit" Version="0.5.15" />

diff --git a/Polyfill.props b/Polyfill.props
@@ -0,0 +1,14 @@
+<Project>
+    <PropertyGroup>
+        <TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
+        <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Backport.System.Threading.Lock" />
+        <PackageReference Include="PolySharp" PrivateAssets="all" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFrameworkIdentifier)'!='.NETCoreApp'">
+        <PackageReference Include="System.Text.Json" />
+        <PackageReference Include="System.Threading.Tasks.Extensions" />
+    </ItemGroup>
+</Project>
diff --git a/TUnit.Assertions/Assert.cs b/TUnit.Assertions/Assert.cs
@@ -97,7 +97,7 @@ public static async Task<Exception> ThrowsAsync(Type type, Func<Task> @delegate,
         {
             await @delegate();
         }
-        catch (Exception e) when (e.GetType().IsAssignableTo(type))
+        catch (Exception e) when (type.IsAssignableFrom(e.GetType()))
         {
             return e;
         }
@@ -121,7 +121,7 @@ public static Exception Throws(Type type, Action @delegate, [CallerArgumentExpre
         {
             @delegate();
         }
-        catch (Exception e) when (e.GetType().IsAssignableTo(type))
+        catch (Exception e) when (type.IsAssignableFrom(e.GetType()))
         {
             return e;
         }

diff --git a/TUnit.Assertions/AssertConditions/Connectors/AndAssertCondition.cs b/TUnit.Assertions/AssertConditions/Connectors/AndAssertCondition.cs
@@ -7,8 +7,8 @@ internal class AndAssertCondition<TActual> : BaseAssertCondition<TActual>
 
     public AndAssertCondition(BaseAssertCondition<TActual> condition1, BaseAssertCondition<TActual> condition2)
     {
-        ArgumentNullException.ThrowIfNull(condition1);
-        ArgumentNullException.ThrowIfNull(condition2);
+        Verify.ArgNotNull(condition1);
+        Verify.ArgNotNull(condition2);
 
         _condition1 = condition1;
         _condition2 = condition2;

diff --git a/TUnit.Assertions/AssertConditions/Connectors/OrAssertCondition.cs b/TUnit.Assertions/AssertConditions/Connectors/OrAssertCondition.cs
@@ -7,8 +7,8 @@ internal class OrAssertCondition<TActual> : BaseAssertCondition<TActual>
 
     public OrAssertCondition(BaseAssertCondition<TActual> condition1, BaseAssertCondition<TActual> condition2)
     {
-        ArgumentNullException.ThrowIfNull(condition1);
-        ArgumentNullException.ThrowIfNull(condition2);
+        Verify.ArgNotNull(condition1);
+        Verify.ArgNotNull(condition2);
 
         _condition1 = condition1;
         _condition2 = condition2;

diff --git a/TUnit.Assertions/AssertionBuilders/Wrappers/DateOnlyEqualToAssertionBuilderWrapper.cs b/TUnit.Assertions/AssertionBuilders/Wrappers/DateOnlyEqualToAssertionBuilderWrapper.cs
@@ -1,4 +1,6 @@
-using System.Runtime.CompilerServices;
+#if NET
+
+using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions.Chronology;
 
 namespace TUnit.Assertions.AssertionBuilders.Wrappers;
@@ -19,4 +21,6 @@ public DateOnlyEqualToAssertionBuilderWrapper WithinDays(int days, [CallerArgume
 
         return this;
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/AssertionBuilders/Wrappers/TimeOnlyEqualToAssertionBuilderWrapper.cs b/TUnit.Assertions/AssertionBuilders/Wrappers/TimeOnlyEqualToAssertionBuilderWrapper.cs
@@ -1,4 +1,6 @@
-using System.Runtime.CompilerServices;
+#if NET
+
+using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions.Chronology;
 
 namespace TUnit.Assertions.AssertionBuilders.Wrappers;
@@ -19,4 +21,6 @@ public TimeOnlyEqualToAssertionBuilderWrapper Within(TimeSpan tolerance, [Caller
 
         return this;
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/AssertionScope.cs b/TUnit.Assertions/AssertionScope.cs
@@ -52,7 +52,7 @@ public void Dispose()
         // In which case it should just throw itself, so we don't need to do that
         if (_exceptions.Count == 1)
         {
-            ExceptionDispatchInfo.Throw(_exceptions[0]);
+            ExceptionDispatchInfo.Capture(_exceptions[0]).Throw();
         }
 
         if (_exceptions.Count > 1)

diff --git a/...Assertions/Assertions/Chronology/Conditions/DateOnlyEqualsExpectedValueAssertCondition.cs b/...Assertions/Assertions/Chronology/Conditions/DateOnlyEqualsExpectedValueAssertCondition.cs
@@ -1,4 +1,6 @@
-namespace TUnit.Assertions.AssertConditions.Chronology;
+#if NET
+
+namespace TUnit.Assertions.AssertConditions.Chronology;
 
 public class DateOnlyEqualsExpectedValueAssertCondition(DateOnly expected) : ExpectedValueAssertCondition<DateOnly, DateOnly>(expected) 
 {
@@ -37,4 +39,6 @@ public void SetTolerance(int toleranceDays)
     {
         _tolerance = toleranceDays;
     }
-}
+}
+
+#endif
diff --git a/...Assertions/Assertions/Chronology/Conditions/TimeOnlyEqualsExpectedValueAssertCondition.cs b/...Assertions/Assertions/Chronology/Conditions/TimeOnlyEqualsExpectedValueAssertCondition.cs
@@ -1,4 +1,6 @@
-namespace TUnit.Assertions.AssertConditions.Chronology;
+#if NET
+
+namespace TUnit.Assertions.AssertConditions.Chronology;
 
 public class TimeOnlyEqualsExpectedValueAssertCondition(TimeOnly expected) : ExpectedValueAssertCondition<TimeOnly, TimeOnly>(expected) 
 {
@@ -37,4 +39,6 @@ public void SetTolerance(TimeSpan tolerance)
     {
         _tolerance = tolerance;
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/Assertions/Chronology/DateOnlyIsExtensions.cs b/TUnit.Assertions/Assertions/Chronology/DateOnlyIsExtensions.cs
@@ -1,5 +1,7 @@
 #nullable disable
 
+#if NET
+
 using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions;
 using TUnit.Assertions.AssertConditions.Chronology;
@@ -49,4 +51,6 @@ public static InvokableValueAssertionBuilder<DateOnly> IsBeforeOrEqualTo(this IV
                 $"to be before or equal to {expected}")
             , [doNotPopulateThisValue]);
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/Assertions/Chronology/TimeOnlyIsExtensions.cs b/TUnit.Assertions/Assertions/Chronology/TimeOnlyIsExtensions.cs
@@ -1,5 +1,7 @@
 #nullable disable
 
+#if NET
+
 using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions;
 using TUnit.Assertions.AssertConditions.Chronology;
@@ -63,4 +65,6 @@ public static InvokableValueAssertionBuilder<TimeOnly> IsBeforeOrEqualTo(this IV
                 $"be before or equal to {expected}")
             , [doNotPopulateThisValue]);
     }
-}
+}
+
+#endif
diff --git a/...s/Assertions/Collections/Conditions/EnumerableEquivalentToExpectedValueAssertCondition.cs b/...s/Assertions/Collections/Conditions/EnumerableEquivalentToExpectedValueAssertCondition.cs
@@ -9,7 +9,7 @@ public class EnumerableEquivalentToExpectedValueAssertCondition<TActual, TInner>
     : ExpectedValueAssertCondition<TActual, IEnumerable<TInner>>(expected)
     where TActual : IEnumerable<TInner>?
 {
-    protected override string GetExpectation() => $"to be equivalent to {(expected != null ? string.Join(',', expected) : null)}";
+    protected override string GetExpectation() => $"to be equivalent to {(expected != null ? string.Join(",", expected) : null)}";
 
     protected override AssertionResult GetResult(TActual? actualValue, IEnumerable<TInner>? expectedValue)
     {
@@ -38,7 +38,7 @@ protected override AssertionResult GetResult(TActual? actualValue, IEnumerable<T
                 () => "it is not null")
             .OrFailIf(
                 () => !orderedActual!.SequenceEqual(expectedValue!, equalityComparer),
-                () => $"it is {string.Join(',', orderedActual!)}"
+                () => $"it is {string.Join(",", orderedActual!)}"
             );
     }
 }
diff --git a/...ssertions/Collections/Conditions/EnumerableNotEquivalentToExpectedValueAssertCondition.cs b/...ssertions/Collections/Conditions/EnumerableNotEquivalentToExpectedValueAssertCondition.cs
@@ -6,7 +6,7 @@ public class EnumerableNotEquivalentToExpectedValueAssertCondition<TActual, TInn
     : ExpectedValueAssertCondition<TActual, IEnumerable<TInner>>(expected)
     where TActual : IEnumerable<TInner>?
 {
-    protected override string GetExpectation() => $" to be not equivalent to {(expected != null ? string.Join(',', expected) : null)}";
+    protected override string GetExpectation() => $" to be not equivalent to {(expected != null ? string.Join(",", expected) : null)}";
 
     protected override AssertionResult GetResult(TActual? actualValue, IEnumerable<TInner>? expectedValue)
     {

diff --git a/TUnit.Assertions/Assertions/Collections/DoesExtensions_Dictionary.cs b/TUnit.Assertions/Assertions/Collections/DoesExtensions_Dictionary.cs
@@ -16,7 +16,7 @@ public static InvokableValueAssertionBuilder<TDictionary> ContainsKey<TDictionar
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<TDictionary, TKey>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return actual.Keys.Cast<TKey>().Contains(expected, equalityComparer);
             },
             (_, _, _) => $"The key \"{expected}\" was not found in the dictionary",
@@ -30,7 +30,7 @@ public static InvokableValueAssertionBuilder<TDictionary> ContainsValue<TDiction
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<TDictionary, TValue>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return actual.Values.Cast<TValue>().Contains(expected, equalityComparer);
             },
             (_, _, _) => $"The value \"{expected}\" was not found in the dictionary",

diff --git a/TUnit.Assertions/Assertions/Collections/DoesNotExtensions_Dictionary.cs b/TUnit.Assertions/Assertions/Collections/DoesNotExtensions_Dictionary.cs
@@ -16,7 +16,7 @@ public static InvokableValueAssertionBuilder<TDictionary> DoesNotContainKey<TDic
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<TDictionary, TKey>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return !actual.Keys.Cast<TKey>().Contains(expected, equalityComparer);
             },
             (_, _, _) => $"The key \"{expected}\" was found in the dictionary",
@@ -30,7 +30,7 @@ public static InvokableValueAssertionBuilder<TDictionary> DoesNotContainValue<TD
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<TDictionary, TValue>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return !actual.Values.Cast<TValue>().Contains(expected, equalityComparer);
             },
             (_, _, _) => $"The value \"{expected}\" was found in the dictionary",

diff --git a/TUnit.Assertions/Assertions/Generics/Conditions/AssignableToExpectedValueAssertCondition.cs b/TUnit.Assertions/Assertions/Generics/Conditions/AssignableToExpectedValueAssertCondition.cs
@@ -13,6 +13,6 @@ protected override Task<AssertionResult> GetResult(TActual? actualValue, Excepti
             .FailIf(() => actualValue is null,
                 () => "actual is null")
             .OrFailIf(
-                () => !actualValue!.GetType().IsAssignableTo(expectedType),
+                () => !expectedType.IsAssignableFrom(actualValue!.GetType()),
                 () => $"it is {ActualValue?.GetType().Name ?? "null"}");
 }
diff --git a/TUnit.Assertions/Assertions/Generics/Conditions/EqualsExpectedValueAssertCondition.cs b/TUnit.Assertions/Assertions/Generics/Conditions/EqualsExpectedValueAssertCondition.cs
@@ -1,4 +1,7 @@
-using TUnit.Assertions.AssertConditions;
+#if !NET
+#pragma warning disable CS8604 // Possible null reference argument.
+#endif
+using TUnit.Assertions.AssertConditions;
 
 namespace TUnit.Assertions.Assertions.Generics.Conditions;
 

diff --git a/TUnit.Assertions/Assertions/Generics/Conditions/EquivalentToExpectedValueAssertCondition.cs b/TUnit.Assertions/Assertions/Generics/Conditions/EquivalentToExpectedValueAssertCondition.cs
@@ -40,7 +40,7 @@ protected override AssertionResult GetResult(TActual? actualValue, TExpected? ex
                         {
                             MembersToIgnore = [.._ignoredMembers]
                         })),
-                    () => $"it is {string.Join(',', actualEnumerable)}");
+                    () => $"it is {string.Join(",", actualEnumerable)}");
         }
 
         bool? isEqual = null;
@@ -78,7 +78,7 @@ protected override AssertionResult GetResult(TActual? actualValue, TExpected? ex
             }
 
             return FailWithMessage($"""
-                                    {firstFailure.Type} {string.Join('.', firstFailure.NestedMemberNames)} did not match
+                                    {firstFailure.Type} {string.Join(".", firstFailure.NestedMemberNames)} did not match
                                     Expected: {Formatter.Format(firstFailure.Expected)}
                                     Received: {Formatter.Format(firstFailure.Actual)}
                                     """);

diff --git a/....Assertions/Assertions/Generics/Conditions/NotAssignableToExpectedValueAssertCondition.cs b/....Assertions/Assertions/Generics/Conditions/NotAssignableToExpectedValueAssertCondition.cs
@@ -13,6 +13,6 @@ protected override Task<AssertionResult> GetResult(TActual? actualValue, Excepti
             .FailIf(() => actualValue is null,
                 () => "actual is null")
             .OrFailIf(
-                () => actualValue!.GetType().IsAssignableTo(expectedType),
+                () => expectedType.IsAssignableFrom(actualValue!.GetType()),
                 () => $"it is {ActualValue?.GetType().Name ?? "null"}");
 }
diff --git a/TUnit.Assertions/Assertions/Numbers/NumberIsExtensions.cs b/TUnit.Assertions/Assertions/Numbers/NumberIsExtensions.cs
@@ -1,5 +1,7 @@
 #nullable disable
 
+#if NET
+
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions;
@@ -134,4 +136,6 @@ public static InvokableValueAssertionBuilder<TActual> IsPositive<TActual>(
                 $"to be positive")
             , []);
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/Assertions/Numbers/NumberIsNotExtensions.cs b/TUnit.Assertions/Assertions/Numbers/NumberIsNotExtensions.cs
@@ -1,5 +1,7 @@
 #nullable disable
 
+#if NET
+
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using TUnit.Assertions.AssertConditions;
@@ -201,4 +203,6 @@ public static InvokableValueAssertionBuilder<TActual> IsNotPositive<TActual>(thi
             $"to not be positive")
             , []);
     }
-}
+}
+
+#endif
diff --git a/TUnit.Assertions/Assertions/Strings/DoesExtensions_String.cs b/TUnit.Assertions/Assertions/Strings/DoesExtensions_String.cs
@@ -59,7 +59,7 @@ public static InvokableValueAssertionBuilder<string> EndsWith(this IValueSource<
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<string, string>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return actual.EndsWith(expected, stringComparison);
             },
             (actual, _, _) => $"\"{actual}\" does not end with \"{expected}\"",
@@ -77,7 +77,7 @@ public static InvokableValueAssertionBuilder<string> Matches(this IValueSource<s
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<string, Regex>(regex,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return regex.IsMatch(actual);
             },
             (actual, _, _) => $"The regex \"{regex}\" does not match with \"{actual}\"",

diff --git a/TUnit.Assertions/Assertions/Strings/DoesNotExtensions_String.cs b/TUnit.Assertions/Assertions/Strings/DoesNotExtensions_String.cs
@@ -31,7 +31,7 @@ public static InvokableValueAssertionBuilder<string> DoesNotStartWith(this IValu
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<string, string>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return !actual.StartsWith(expected, stringComparison);
             },
             (actual, _, _) => $"\"{actual}\" does start with \"{expected}\"",
@@ -50,7 +50,7 @@ public static InvokableValueAssertionBuilder<string> DoesNotEndWith(this IValueS
         return valueSource.RegisterAssertion(new FuncValueAssertCondition<string, string>(expected,
             (actual, _, _) =>
             {
-                ArgumentNullException.ThrowIfNull(actual);
+                Verify.ArgNotNull(actual);
                 return !actual.EndsWith(expected, stringComparison);
             },
             (actual, _, _) => $"\"{actual}\" does end with \"{expected}\"",

diff --git a/TUnit.Assertions/Assertions/Throws/ThrowsOfTypeAssertCondition.cs b/TUnit.Assertions/Assertions/Throws/ThrowsOfTypeAssertCondition.cs
@@ -13,7 +13,7 @@ protected override Task<AssertionResult> GetResult(TActual? actualValue, Excepti
             () => exception is null,
             () => "none was thrown")
         .OrFailIf(
-            () => !exception!.GetType().IsAssignableTo(typeof(TExpectedException)),
+            () => !typeof(TExpectedException).IsAssignableFrom(exception!.GetType()),
             () => $"{exception?.GetType().Name.PrependAOrAn()} was thrown"
         );
 }