diff --git a/Directory.Packages.props b/Directory.Packages.props
index 84b4753..061c2e3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.3.0.106239" />
+    <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/README.md b/README.md
index 9f3d6f7..84acfcb 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,14 @@ Arcade-light is inspired from [dotnet/arcade](https://github.com/dotnet/arcade)
 ```json
 {
   "sdk": {
-    "version": "8.0.403",
+    "version": "8.0.404",
     "rollForward": "latestFeature"
   },
   "tools": {
-    "dotnet": "8.0.403"
+    "dotnet": "8.0.404"
   },
   "msbuild-sdks": {
-    "DotNetDev.ArcadeLight.Sdk": "1.7.5"
+    "DotNetDev.ArcadeLight.Sdk": "1.8.0"
   }
 }
 ```
@@ -56,7 +56,7 @@ Arcade-light is inspired from [dotnet/arcade](https://github.com/dotnet/arcade)
   </PropertyGroup>
 
   <ItemGroup>
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" />
   </ItemGroup>
   ...
 <\Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 062f95b..2b4e1eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <!-- Libs -->
-    <XUnitVersion>2.9.2</XUnitVersion>
+    <XUnitV3Version>1.0.0</XUnitV3Version>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
index 90d4a79..153d678 100644
--- a/global.json
+++ b/global.json
@@ -7,6 +7,6 @@
     "dotnet": "9.0.100-rc.1.24452.12"
   },
   "msbuild-sdks": {
-    "DotNetDev.ArcadeLight.Sdk": "1.8.0-beta.1"
+    "DotNetDev.ArcadeLight.Sdk": "1.8.0"
   }
 }
diff --git a/nuget.config b/nuget.config
index 56ae5f4..67a0481 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,7 +4,7 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="coverlet-nightly" value="https://pkgs.dev.azure.com/tonerdo/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json" />
-    <add key="intern" value="https://pkgs.dev.azure.com/bertk0374/_packaging/intern/nuget/v3/index.json" />
+    <!--<add key="intern" value="https://pkgs.dev.azure.com/bertk0374/_packaging/intern/nuget/v3/index.json"--> />
     <!--<add key="local-folder" value="C:\local_source" />-->
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
   </packageSources>
@@ -18,8 +18,8 @@
     <packageSource key="dotnet-libraries">
       <package pattern="System.CommandLine*" />
     </packageSource>
-    <packageSource key="intern">
+    <!--<packageSource key="intern">
       <package pattern="DotNetDev.ArcadeLight*" />
-    </packageSource>
+    </packageSource>-->
   </packageSourceMapping>
 </configuration>
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);