diff --git a/.github/workflows/unit-tests-for-mstest.yml b/.github/workflows/unit-tests-for-mstest.yml
index dc128e1..56d3b8d 100644
--- a/.github/workflows/unit-tests-for-mstest.yml
+++ b/.github/workflows/unit-tests-for-mstest.yml
@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checkout the code
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Install .NET Core SDK
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 6.0.*
+          dotnet-version: 8.0.*
 
       # Perform unit tests
       - name: Perform unit tests
-        run: dotnet test ChainingAssertion.MSTest.UnitTest -l "console;verbosity=normal" -v:q --nologo
+        run: dotnet test ChainingAssertion.MSTest.UnitTest -l "console;verbosity=normal" -v:q --nologo -f:net8.0
diff --git a/.github/workflows/unit-tests-for-xunit.yml b/.github/workflows/unit-tests-for-xunit.yml
index e618f34..4ab0c24 100644
--- a/.github/workflows/unit-tests-for-xunit.yml
+++ b/.github/workflows/unit-tests-for-xunit.yml
@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checkout the code
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Install .NET Core SDK
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 6.0.*
+          dotnet-version: 8.0.*
 
       # Perform unit tests
       - name: Perform unit tests
-        run: dotnet test ChainingAssertion.xUnit.UnitTest -l "console;verbosity=normal" -v:q --nologo
+        run: dotnet test ChainingAssertion.xUnit.UnitTest -l "console;verbosity=normal" -v:q --nologo -f:net8.0
diff --git a/ChainingAssertion.MSTest.UnitTest/AssertExTest.cs b/ChainingAssertion.MSTest.UnitTest/AssertExTest.cs
index 28dd261..b46e054 100644
--- a/ChainingAssertion.MSTest.UnitTest/AssertExTest.cs
+++ b/ChainingAssertion.MSTest.UnitTest/AssertExTest.cs
@@ -48,7 +48,7 @@ public void CollectionTest()
     public void OthersTest()
     {
         // Null Assertions
-        Object? obj = GetNullableObject();
+        var obj = GetNullableObject();
         obj.IsNotNull(); // Assert.NotNull(obj)
         obj.ToString().Is("{ Foo = Bar }");
 
@@ -219,74 +219,46 @@ public void DynamicNullableTest()
     {
         var d = new PrivateMock().AsDynamic();
 
-        (d.NullableMethod((IEnumerable<int>?)null) as string).Is("enumerable");
-        (d.NullableMethod((List<int>?)null) as string).Is("enumerable");
+        AssertEx.Throws<ArgumentException>(() => { d.NullableMethod((IEnumerable<int>?)null); })
+            .IsNotNull()
+            .Message.StartsWith("\"NullableMethod\" ambiguous arguments")
+            .IsTrue();
+        AssertEx.Throws<ArgumentException>(() => { d.NullableMethod((List<int>?)null); })
+            .IsNotNull()
+            .Message.StartsWith("\"NullableMethod\" ambiguous arguments")
+            .IsTrue();
 
         (d.NullableMethod(Enumerable.Range(1, 10)) as string).Is("enumerable");
-        (d.NullableMethod(new List<int>().AsEnumerable()) as string).Is("enumerable");
-        (d.NullableMethod(new List<int>()) as string).Is("enumerable");
+        (d.NullableMethod(new List<int>().AsEnumerable()) as string).Is("list");
+        (d.NullableMethod(new List<int>()) as string).Is("list");
     }
 
     public class GenericPrivateMock
     {
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b)
-        {
-            return "a";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b) => "a";
 
-        private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b)
-        {
-            return "b";
-        }
+        private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b) => "b";
 
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i)
-        {
-            return "c";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i) => "c";
 
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b)
-        {
-            return "d";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b) => "d";
 
-        private string PrivateGeneric(string t1a, string t2a, string t1b)
-        {
-            return "e";
-        }
+        private string PrivateGeneric(string t1a, string t2a, string t1b) => "e";
 
-        private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b)
-        {
-            return "f";
-        }
+        private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b) => "f";
 
-        private string PrivateGeneric<T>()
-        {
-            return "g";
-        }
+        private string PrivateGeneric<T>() => "g";
 
-        private string PrivateGeneric()
-        {
-            return "h";
-        }
+        private string PrivateGeneric() => "h";
 
-        private Type ReturnType<T>(T t1, T t2)
-        {
-            return typeof(T);
-        }
+        private Type ReturnType<T>(T t1, T t2) => typeof(T);
 
-        private Type ReturnType<T>(IEnumerable<T> t1, T t2)
-        {
-            return typeof(T);
-        }
+        private Type ReturnType<T>(IEnumerable<T> t1, T t2) => typeof(T);
 
-        private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 xxx)
-        {
-            return "dict";
-        }
+        private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 t) => "dict";
     }
 
     [TestMethod]
-    [Ignore("Currently, this test is broken. It would be fixed in the future.")]
     public void GenericPrivateTest()
     {
         var d = new GenericPrivateMock().AsDynamic();
@@ -303,12 +275,18 @@ public void GenericPrivateTest()
         (d.PrivateGeneric<int, string, double>(0.0, "", 0, 0.0) as string).Is("f");
         (d.PrivateGeneric<int>() as string).Is("g");
         (d.PrivateGeneric() as string).Is("h");
-        (d.ReturnType(0, 0) as Type).Is(typeof(int));
-
         (d.PrivateGeneric(0, "", 0) as string).Is("c");
         (d.PrivateGeneric<int, string>(0, "", 0) as string).Is("c");
         (d.PrivateGeneric(0, 0, 0) as string).Is("c");
+
+        (d.ReturnType(0, 0) as Type).Is(typeof(int));
+        (d.ReturnType(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
+        (d.ReturnType<int>(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
         (d.ReturnType<IEnumerable<int>>(Enumerable.Range(1, 10), new List<int>()) as Type).Is(typeof(IEnumerable<int>));
+
+        var dict = new Dictionary<int, IDictionary<string, double>>();
+        (d.DictGen(dict, 1.9) as string).Is("dict");
+        (d.DictGen<int, string, double>(dict, 1.9) as string).Is("dict");
     }
 
     [TestMethod]
@@ -326,20 +304,6 @@ public void GenericPrivateExceptionTest()
         e3.Message.Is(s => s.Contains("not match arguments") && s.Contains("PrivateGeneric"));
     }
 
-    [TestMethod]
-    [Ignore("Currently, this test is broken. It would be fixed in the future.")]
-    public void DynamicNotSupportedCase()
-    {
-        var d = new GenericPrivateMock().AsDynamic();
-
-        (d.ReturnType(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
-        (d.ReturnType<int>(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
-
-        var dict = new Dictionary<int, IDictionary<string, double>>();
-        (d.DictGen(dict, 1.9) as string).Is("dict");
-        (d.DictGen<int, string, double>(dict, 1.9) as string).Is("dict");
-    }
-
     private class Person
     {
         public int Age { get; set; }
@@ -527,7 +491,7 @@ public void Exception()
     [TestMethod]
     public void IsNullMethodMessage()
     {
-        object? o = new object();
+        var o = new object();
         o.IsNotNull();
         AssertEx.Throws<AssertFailedException>(
             () => o.IsNull("msg_msg"))
@@ -639,7 +603,7 @@ public void StructuralEqualFailed()
         object? n = null;
         AssertEx.Throws<AssertFailedException>(() => n.IsStructuralEqual("a"));
         AssertEx.Throws<AssertFailedException>(() => "a".IsStructuralEqual(n));
-        int i = 10;
+        var i = 10;
         long l = 10;
         AssertEx.Throws<AssertFailedException>(() => i.IsStructuralEqual(l));
 
@@ -768,7 +732,7 @@ public void NotStructuralEqualSuccess()
         object? n = null;
         n.IsNotStructuralEqual("a");
         "a".IsNotStructuralEqual(n);
-        int i = 10;
+        var i = 10;
         long l = 10;
         i.IsNotStructuralEqual(l);
 
diff --git a/ChainingAssertion.MSTest.UnitTest/ChainingAssertion.MSTest.UnitTest.csproj b/ChainingAssertion.MSTest.UnitTest/ChainingAssertion.MSTest.UnitTest.csproj
index c0f3696..beda8d0 100644
--- a/ChainingAssertion.MSTest.UnitTest/ChainingAssertion.MSTest.UnitTest.csproj
+++ b/ChainingAssertion.MSTest.UnitTest/ChainingAssertion.MSTest.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/ChainingAssertion.NUnit.UnitTest/AssertExTest.cs b/ChainingAssertion.NUnit.UnitTest/AssertExTest.cs
index 5eb7ecb..4973fe1 100644
--- a/ChainingAssertion.NUnit.UnitTest/AssertExTest.cs
+++ b/ChainingAssertion.NUnit.UnitTest/AssertExTest.cs
@@ -95,7 +95,7 @@ public void TestCaseTest(int x, int y, int z)
     }
 
     [Test]
-    [TestCaseSource("toaruSource")]
+    [TestCaseSource(nameof(toaruSource))]
     public void TestTestCaseSource(int x, int y, string z)
     {
         string.Concat(x, y).Is(z);
@@ -215,60 +215,27 @@ public void DynamicNullableTest()
 
     public class GenericPrivateMock
     {
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b)
-        {
-            return "a";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b) => "a";
 
-        private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b)
-        {
-            return "b";
-        }
+        private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b) => "b";
 
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i)
-        {
-            return "c";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i) => "c";
 
-        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b)
-        {
-            return "d";
-        }
+        private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b) => "d";
 
-        private string PrivateGeneric(string t1a, string t2a, string t1b)
-        {
-            return "e";
-        }
+        private string PrivateGeneric(string t1a, string t2a, string t1b) => "e";
 
-        private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b)
-        {
-            return "f";
-        }
+        private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b) => "f";
 
-        private string PrivateGeneric<T>()
-        {
-            return "g";
-        }
+        private string PrivateGeneric<T>() => "g";
 
-        private string PrivateGeneric()
-        {
-            return "h";
-        }
+        private string PrivateGeneric() => "h";
 
-        private Type ReturnType<T>(T t1, T t2)
-        {
-            return typeof(T);
-        }
+        private Type ReturnType<T>(T t1, T t2) => typeof(T);
 
-        private Type ReturnType<T>(IEnumerable<T> t1, T t2)
-        {
-            return typeof(T);
-        }
+        private Type ReturnType<T>(IEnumerable<T> t1, T t2) => typeof(T);
 
-        private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 xxx)
-        {
-            return "dict";
-        }
+        private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 t) => "dict";
     }
 
     [Test]
@@ -288,12 +255,18 @@ public void GenericPrivateTest()
         (d.PrivateGeneric<int, string, double>(0.0, "", 0, 0.0) as string).Is("f");
         (d.PrivateGeneric<int>() as string).Is("g");
         (d.PrivateGeneric() as string).Is("h");
-        (d.ReturnType(0, 0) as Type).Is(typeof(int));
-
         (d.PrivateGeneric(0, "", 0) as string).Is("c");
         (d.PrivateGeneric<int, string>(0, "", 0) as string).Is("c");
         (d.PrivateGeneric(0, 0, 0) as string).Is("c");
+
+        (d.ReturnType(0, 0) as Type).Is(typeof(int));
+        (d.ReturnType(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
+        (d.ReturnType<int>(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
         (d.ReturnType<IEnumerable<int>>(Enumerable.Range(1, 10), new List<int>()) as Type).Is(typeof(IEnumerable<int>));
+
+        var dict = new Dictionary<int, IDictionary<string, double>>();
+        (d.DictGen(dict, 1.9) as string).Is("dict");
+        (d.DictGen<int, string, double>(dict, 1.9) as string).Is("dict");
     }
 
     [Test]
diff --git a/ChainingAssertion.xUnit.UnitTest/AssertExTest.cs b/ChainingAssertion.xUnit.UnitTest/AssertExTest.cs
index d3a5bcf..882232c 100644
--- a/ChainingAssertion.xUnit.UnitTest/AssertExTest.cs
+++ b/ChainingAssertion.xUnit.UnitTest/AssertExTest.cs
@@ -48,7 +48,7 @@ public void CollectionTest()
         public void OthersTest()
         {
             // Null Assertions
-            Object? obj = GetNullableObject();
+            var obj = GetNullableObject();
             obj.IsNotNull(); // Assert.NotNull(obj)
             obj.ToString().Is("{ Foo = Bar }");
 
@@ -101,13 +101,13 @@ public void TestCaseTest(int x, int y, int z)
         }
 
         [Theory]
-        [MemberData("toaruSource")]
+        [MemberData(nameof(toaruSource))]
         public void TestTestCaseSource(int x, int y, string z)
         {
             string.Concat(x, y).Is(z);
         }
 
-        public static object[] toaruSource
+        public static IEnumerable<object[]> toaruSource
         {
             get
             {
@@ -211,74 +211,46 @@ public void DynamicNullableTest()
         {
             var d = new PrivateMock().AsDynamic();
 
-            (d.NullableMethod((IEnumerable<int>?)null) as string).Is("enumerable");
-            (d.NullableMethod((List<int>?)null) as string).Is("enumerable");
+            Assert.Throws<ArgumentException>(() => { d.NullableMethod((IEnumerable<int>?)null); })
+                .IsNotNull()
+                .Message.StartsWith("\"NullableMethod\" ambiguous arguments")
+                .IsTrue();
+            Assert.Throws<ArgumentException>(() => { d.NullableMethod((List<int>?)null); })
+                .IsNotNull()
+                .Message.StartsWith("\"NullableMethod\" ambiguous arguments")
+                .IsTrue();
 
             (d.NullableMethod(Enumerable.Range(1, 10)) as string).Is("enumerable");
-            (d.NullableMethod(new List<int>().AsEnumerable()) as string).Is("enumerable");
-            (d.NullableMethod(new List<int>()) as string).Is("enumerable");
+            (d.NullableMethod(new List<int>().AsEnumerable()) as string).Is("list");
+            (d.NullableMethod(new List<int>()) as string).Is("list");
         }
 
         public class GenericPrivateMock
         {
-            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b)
-            {
-                return "a";
-            }
+            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, T1 t1b) => "a";
 
-            private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b)
-            {
-                return "b";
-            }
+            private string PrivateGeneric<T1, T2, T3>(T1 t1a, T2 t2a, T1 t1b) => "b";
 
-            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i)
-            {
-                return "c";
-            }
+            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i) => "c";
 
-            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b)
-            {
-                return "d";
-            }
+            private string PrivateGeneric<T1, T2>(T1 t1a, T2 t2a, int i, T2 t2b) => "d";
 
-            private string PrivateGeneric(string t1a, string t2a, string t1b)
-            {
-                return "e";
-            }
+            private string PrivateGeneric(string t1a, string t2a, string t1b) => "e";
 
-            private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b)
-            {
-                return "f";
-            }
+            private string PrivateGeneric<T1, T2, T3>(T3 t3a, T2 t2, T1 t1, T3 t3b) => "f";
 
-            private string PrivateGeneric<T>()
-            {
-                return "g";
-            }
+            private string PrivateGeneric<T>() => "g";
 
-            private string PrivateGeneric()
-            {
-                return "h";
-            }
+            private string PrivateGeneric() => "h";
 
-            private Type ReturnType<T>(T t1, T t2)
-            {
-                return typeof(T);
-            }
+            private Type ReturnType<T>(T t1, T t2) => typeof(T);
 
-            private Type ReturnType<T>(IEnumerable<T> t1, T t2)
-            {
-                return typeof(T);
-            }
+            private Type ReturnType<T>(IEnumerable<T> t1, T t2) => typeof(T);
 
-            private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 xxx)
-            {
-                return "dict";
-            }
+            private string DictGen<T1, T2, T3>(IDictionary<T1, IDictionary<T2, T3>> dict, T3 t) => "dict";
         }
 
-        // Currently, this test is broken. It would be fixed in the future.
-        // [Fact]
+        [Fact]
         private void GenericPrivateTest()
         {
             var d = new GenericPrivateMock().AsDynamic();
@@ -295,12 +267,18 @@ private void GenericPrivateTest()
             (d.PrivateGeneric<int, string, double>(0.0, "", 0, 0.0) as string).Is("f");
             (d.PrivateGeneric<int>() as string).Is("g");
             (d.PrivateGeneric() as string).Is("h");
-            (d.ReturnType(0, 0) as Type).Is(typeof(int));
-
             (d.PrivateGeneric(0, "", 0) as string).Is("c");
             (d.PrivateGeneric<int, string>(0, "", 0) as string).Is("c");
             (d.PrivateGeneric(0, 0, 0) as string).Is("c");
+
+            (d.ReturnType(0, 0) as Type).Is(typeof(int));
+            (d.ReturnType(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
+            (d.ReturnType<int>(Enumerable.Range(1, 10), 0) as Type).Is(typeof(int));
             (d.ReturnType<IEnumerable<int>>(Enumerable.Range(1, 10), new List<int>()) as Type).Is(typeof(IEnumerable<int>));
+
+            var dict = new Dictionary<int, IDictionary<string, double>>();
+            (d.DictGen(dict, 1.9) as string).Is("dict");
+            (d.DictGen<int, string, double>(dict, 1.9) as string).Is("dict");
         }
 
         [Fact]
@@ -441,7 +419,7 @@ public void StructuralEqualFailed()
             object? n = null;
             Assert.Throws<ArgumentNullException>(() => n.IsStructuralEqual("a"));
             Assert.Throws<ArgumentNullException>(() => "a".IsStructuralEqual(n));
-            int i = 10;
+            var i = 10;
             long l = 10;
             Assert.Throws<XunitException>(() => i.IsStructuralEqual(l));
 
@@ -570,7 +548,7 @@ public void NotStructuralEqualSuccess()
             object? n = null;
             n.IsNotStructuralEqual("a");
             "a".IsNotStructuralEqual(n);
-            int i = 10;
+            var i = 10;
             long l = 10;
             i.IsNotStructuralEqual(l);
 
diff --git a/ChainingAssertion.xUnit.UnitTest/ChainingAssertion.xUnit.UnitTest.csproj b/ChainingAssertion.xUnit.UnitTest/ChainingAssertion.xUnit.UnitTest.csproj
index 2092121..a91031b 100644
--- a/ChainingAssertion.xUnit.UnitTest/ChainingAssertion.xUnit.UnitTest.csproj
+++ b/ChainingAssertion.xUnit.UnitTest/ChainingAssertion.xUnit.UnitTest.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>