diff --git a/Directory.Packages.props b/Directory.Packages.props
index df73389..061c2e3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="0.4.0.108396" />
+    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.4.0.108396" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" />
     <GlobalPackageReference Include="System.CommandLine.Generator" Version="2.0.0-beta4.23307.1" />
   </ItemGroup>
@@ -46,4 +46,4 @@
     <PackageVersion Include="System.ServiceModel.Duplex" Version="6.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs b/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs
index 72806a7..ac4db93 100644
--- a/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs
+++ b/src/RazorPages/RazorPagesTestSample.Tests/UnitTests/DataAccessLayerTest.cs
@@ -23,7 +23,7 @@ public async Task GetMessagesAsync_MessagesAreReturned()
             List<Message> result = await db.GetMessagesAsync();
 
             // Assert
-            List<Message> actualMessages = Assert.IsAssignableFrom<List<Message>>(result);
+            List<Message> actualMessages = Assert.IsType<List<Message>>(result, exactMatch: false);
             Assert.Equal(
                 expectedMessages.OrderBy(m => m.Id).Select(m => m.Text),
                 actualMessages.OrderBy(m => m.Id).Select(m => m.Text));
@@ -41,7 +41,7 @@ public async Task AddMessageAsync_MessageIsAdded()
             await db.AddMessageAsync(expectedMessage);
 
             // Assert
-            Message actualMessage = await db.FindAsync<Message>(recId, TestContext.Current.CancellationToken);
+            Message actualMessage = await db.FindAsync<Message>(new object[] { recId, TestContext.Current.CancellationToken }, TestContext.Current.CancellationToken);
             Assert.Equal(expectedMessage, actualMessage);
         }
 
@@ -101,7 +101,6 @@ public async Task DeleteMessageAsync_NoMessageIsDeleted_WhenMessageIsNotFound()
             int recId = 4;
 
             // Act
-#pragma warning disable CA1031 // Do not catch general exception types
             try
             {
                 await db.DeleteMessageAsync(recId);
@@ -110,7 +109,6 @@ public async Task DeleteMessageAsync_NoMessageIsDeleted_WhenMessageIsNotFound()
             {
                 // recId doesn't exist
             }
-#pragma warning restore CA1031 // Do not catch general exception types
 
             // Assert
             List<Message> actualMessages = await db.Messages.AsNoTracking().ToListAsync(cancellationToken: TestContext.Current.CancellationToken);