diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 221f0b3589..3a3a61fb88 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22609.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23058.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e24006ee217f68b0c8a36cf272536ac239c9c47</Sha>
+      <Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/BuildConfiguration/build-configuration.json b/eng/common/BuildConfiguration/build-configuration.json
new file mode 100644
index 0000000000..3d1cc89894
--- /dev/null
+++ b/eng/common/BuildConfiguration/build-configuration.json
@@ -0,0 +1,4 @@
+{
+  "RetryCountLimit": 1,
+  "RetryByAnyError": false
+}
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 292ebb6535..c670cb7968 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -1,30 +1,25 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
 # NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
 
-if [[ "$#" -lt 3 ]]; then
+if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
   echo "Usage..."
-  echo "init-compiler.sh <script directory> <Architecture> <compiler>"
-  echo "Specify the script directory."
+  echo "build_arch=<ARCH> compiler=<NAME> init-compiler.sh"
   echo "Specify the target architecture."
   echo "Specify the name of compiler (clang or gcc)."
   exit 1
 fi
 
-nativescriptroot="$1"
-build_arch="$2"
-compiler="$3"
-
 case "$compiler" in
     clang*|-clang*|--clang*)
         # clangx.y or clang-x.y
         version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
-        parts=(${version//./ })
-        majorVersion="${parts[0]}"
-        minorVersion="${parts[1]}"
-        if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
+        majorVersion="${version%%.*}"
+        [ -z "${version##*.*}" ] && minorVersion="${version#*.}"
+
+        if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then
             minorVersion=0;
         fi
         compiler=clang
@@ -33,23 +28,20 @@ case "$compiler" in
     gcc*|-gcc*|--gcc*)
         # gccx.y or gcc-x.y
         version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
-        parts=(${version//./ })
-        majorVersion="${parts[0]}"
-        minorVersion="${parts[1]}"
+        majorVersion="${version%%.*}"
+        [ -z "${version##*.*}" ] && minorVersion="${version#*.}"
         compiler=gcc
         ;;
 esac
 
 cxxCompiler="$compiler++"
 
-. "$nativescriptroot"/../pipeline-logging-functions.sh
-
 # clear the existing CC and CXX from environment
 CC=
 CXX=
 LDFLAGS=
 
-if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi
+if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi
 
 check_version_exists() {
     desired_version=-1
@@ -66,40 +58,41 @@ check_version_exists() {
     echo "$desired_version"
 }
 
-if [[ -z "$CLR_CC" ]]; then
+if [ -z "$CLR_CC" ]; then
 
     # Set default versions
-    if [[ -z "$majorVersion" ]]; then
+    if [ -z "$majorVersion" ]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-        elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
-
-        for version in "${versions[@]}"; do
-            parts=(${version//./ })
-            desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
-            if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi
+        if [ "$compiler" = "clang" ]; then versions="15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
+        elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi
+
+        for version in $versions; do
+            _major="${version%%.*}"
+            [ -z "${version##*.*}" ] && _minor="${version#*.}"
+            desired_version="$(check_version_exists "$_major" "$_minor")"
+            if [ "$desired_version" != "-1" ]; then majorVersion="$_major"; break; fi
         done
 
-        if [[ -z "$majorVersion" ]]; then
+        if [ -z "$majorVersion" ]; then
             if command -v "$compiler" > /dev/null; then
-                if [[ "$(uname)" != "Darwin" ]]; then
-                    Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
+                if [ "$(uname)" != "Darwin" ]; then
+                    echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
                 fi
                 CC="$(command -v "$compiler")"
                 CXX="$(command -v "$cxxCompiler")"
             else
-                Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
+                echo "No usable version of $compiler found."
                 exit 1
             fi
         else
-            if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
-                if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
+            if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
+                if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
                     if command -v "$compiler" > /dev/null; then
-                        Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
+                        echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
                         CC="$(command -v "$compiler")"
                         CXX="$(command -v "$cxxCompiler")"
                     else
-                        Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
+                        echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
                         exit 1
                     fi
                 fi
@@ -107,33 +100,33 @@ if [[ -z "$CLR_CC" ]]; then
         fi
     else
         desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
-        if [[ "$desired_version" == "-1" ]]; then
-            Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
+        if [ "$desired_version" = "-1" ]; then
+            echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
             exit 1
         fi
     fi
 
-    if [[ -z "$CC" ]]; then
+    if [ -z "$CC" ]; then
         CC="$(command -v "$compiler$desired_version")"
         CXX="$(command -v "$cxxCompiler$desired_version")"
-        if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi
+        if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
     fi
 else
-    if [[ ! -f "$CLR_CC" ]]; then
-        Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
+    if [ ! -f "$CLR_CC" ]; then
+        echo "CLR_CC is set but path '$CLR_CC' does not exist"
         exit 1
     fi
     CC="$CLR_CC"
     CXX="$CLR_CXX"
 fi
 
-if [[ -z "$CC" ]]; then
-    Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
+if [ -z "$CC" ]; then
+    echo "Unable to find $compiler."
     exit 1
 fi
 
 # Only lld version >= 9 can be considered stable. lld doesn't support s390x.
-if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then
+if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then
     if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
         LDFLAGS="-fuse-ld=lld"
     fi
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 9f55d3f466..0549e4c71c 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,6 +24,7 @@ parameters:
   enablePublishBuildAssets: false
   enablePublishTestResults: false
   enablePublishUsingPipelines: false
+  enableBuildRetry: false
   disableComponentGovernance: false
   componentGovernanceIgnoreDirectories: ''
   mergeTestResults: false
@@ -228,3 +229,8 @@ jobs:
         BuildDropPath: ${{ parameters.buildDropPath }}
         IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
 
+  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+    - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration
+      artifact: BuildConfiguration
+      displayName: Publish build retry configuration
+      continueOnError: true
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index c2cabcf9e0..60ab00c4de 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -14,6 +14,7 @@ parameters:
   ReusePr: true
   UseLfLineEndings: true
   UseCheckedInLocProjectJson: false
+  SkipLocProjectJsonGeneration: false
   LanguageSet: VS_Main_Languages
   LclSource: lclFilesInRepo
   LclPackageId: ''
@@ -56,12 +57,13 @@ jobs:
         demands: ImageOverride -equals windows.vs2019.amd64
 
   steps:
-    - task: Powershell@2
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
-        arguments: $(_GenerateLocProjectArguments)
-      displayName: Generate LocProject.json
-      condition: ${{ parameters.condition }}
+    - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
+      - task: Powershell@2
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+          arguments: $(_GenerateLocProjectArguments)
+        displayName: Generate LocProject.json
+        condition: ${{ parameters.condition }}
 
     - task: OneLocBuild@2
       displayName: OneLocBuild
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 09c506d118..71b66aeb8a 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20220804.1
+  sourceIndexPackageVersion: 1.0.1-20221220.2
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
@@ -40,10 +40,10 @@ jobs:
     - ${{ preStep }}
 
   - task: UseDotNet@2
-    displayName: Use .NET Core sdk 3.1
+    displayName: Use .NET Core SDK 6
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 6.0.x
       installationPath: $(Agent.TempDirectory)/dotnet
       workingDirectory: $(Agent.TempDirectory)
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index fc56f63f6f..7caacc6de2 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
     $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
   } elseif ($msbuildEngine -eq "vs") {
     try {
       $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
       (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
       (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
     )
     $selectedPath = $null
     foreach ($path in $possiblePaths) {
@@ -815,7 +817,8 @@ function MSBuild-Core() {
       Write-Host "See log: $buildLog" -ForegroundColor DarkGray
     }
 
-    if ($ci) {
+    # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) {
       Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
       # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
       # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 975e6be639..cf9fb1ea2d 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -312,7 +312,7 @@ function InitializeBuildTool {
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
-  _InitializeBuildToolFramework="net7.0"
+  _InitializeBuildToolFramework="net8.0"
 }
 
 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
+    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
     for path in "${possiblePaths[@]}"; do
       if [[ -f $path ]]; then
         selectedPath=$path
@@ -472,7 +474,9 @@ function MSBuild-Core {
       # We should not Write-PipelineTaskError here because that message shows up in the build summary
       # The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
       echo "Build failed with exit code $exit_code. Check errors above."
-      if [[ "$ci" == "true" ]]; then
+
+      # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+      if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then
         Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
         # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
         # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/global.json b/global.json
index 6e7d2adb4b..7b53b1a1c5 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100"
+    "version": "8.0.100-alpha.1.23055.1"
   },
   "tools": {
-    "dotnet": "7.0.100",
+    "dotnet": "8.0.100-alpha.1.23055.1",
     "runtimes": {
       "dotnet": [
         "6.0.4"
@@ -14,6 +14,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22609.3"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1"
   }
 }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationExtensions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationExtensions.cs
index 5faf3d5c3d..78253fa186 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationExtensions.cs
@@ -50,10 +50,7 @@ public static AuthenticationBuilder AddRemoteClientAuthentication(this Authentic
     /// <returns>The authentication builder updated with the remote authentication handler added using the given scheme and configuration.</returns>
     public static AuthenticationBuilder AddRemoteAppAuthentication(this AuthenticationBuilder authenticationBuilder, string scheme, Action<RemoteAppAuthenticationClientOptions>? configureOptions = null)
     {
-        if (authenticationBuilder is null)
-        {
-            throw new ArgumentNullException(nameof(authenticationBuilder));
-        }
+        ArgumentNullException.ThrowIfNull(authenticationBuilder);
 
         authenticationBuilder.Services.AddScoped<IRemoteAppAuthenticationResultProcessor, RedirectUrlProcessor>();
         authenticationBuilder.Services.AddSingleton<IAuthenticationResultFactory, RemoteAppAuthenticationResultFactory>();
@@ -71,10 +68,7 @@ public static AuthenticationBuilder AddRemoteAppAuthentication(this Authenticati
     /// <param name="configureOptions">Configuration options for the remote authentication handler.</param>
     public static ISystemWebAdapterRemoteClientAppBuilder AddAuthenticationClient(this ISystemWebAdapterRemoteClientAppBuilder builder, bool isDefaultScheme, Action<RemoteAppAuthenticationClientOptions>? configureOptions = null)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
 
         builder.Services.AddAuthentication(options =>
         {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationResultFactory.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationResultFactory.cs
index 72905ae518..c85fa22a01 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationResultFactory.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Authentication/RemoteAppAuthenticationResultFactory.cs
@@ -19,15 +19,8 @@ internal class RemoteAppAuthenticationResultFactory : IAuthenticationResultFacto
 {
     public async Task<RemoteAppAuthenticationResult> CreateRemoteAppAuthenticationResultAsync(HttpResponseMessage response, RemoteAppAuthenticationClientOptions options)
     {
-        if (response is null)
-        {
-            throw new ArgumentNullException(nameof(response));
-        }
-
-        if (options is null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
+        ArgumentNullException.ThrowIfNull(response);
+        ArgumentNullException.ThrowIfNull(options);
 
         RemoteAppAuthenticationResult? ret = null;
 
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/PreBufferRequestStreamMiddleware.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/PreBufferRequestStreamMiddleware.cs
index 35fde0c818..0d096d03b0 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/PreBufferRequestStreamMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/PreBufferRequestStreamMiddleware.cs
@@ -18,9 +18,13 @@ public async Task InvokeAsync(HttpContextCore context)
     {
         var metadata = context.GetEndpoint()?.Metadata.GetMetadata<PreBufferRequestStreamAttribute>() ?? _defaultMetadata;
         var existing = context.Features.GetRequired<IHttpRequestFeature>();
+
+#pragma warning disable CA2000 // Dispose objects before losing scope
+        // This is registered to be disposed with the HttpContext below
         var requestFeature = new HttpRequestAdapterFeature(existing, metadata.BufferThreshold, metadata.BufferLimit);
+#pragma warning restore CA2000 // Dispose objects before losing scope
 
-        if(!metadata.IsDisabled)
+        if (!metadata.IsDisabled)
         {
             await requestFeature.BufferInputStreamAsync(context.RequestAborted);
         }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientExtensions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientExtensions.cs
index a34b0af6ff..df9b7238fa 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientExtensions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientExtensions.cs
@@ -16,15 +16,8 @@ public static class RemoteAppClientExtensions
     /// </summary>
     public static ISystemWebAdapterRemoteClientAppBuilder AddRemoteAppClient(this ISystemWebAdapterBuilder builder, Action<RemoteAppClientOptions> configure)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
-
-        if (configure is null)
-        {
-            throw new ArgumentNullException(nameof(configure));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(configure);
 
         builder.Services.AddSingleton<IPostConfigureOptions<RemoteAppClientOptions>, RemoteAppClientPostConfigureOptions>();
         builder.Services.AddOptions<RemoteAppClientOptions>()
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientOptions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientOptions.cs
index 6b03612735..f15c1ab7db 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientOptions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientOptions.cs
@@ -35,13 +35,10 @@ public Uri RemoteAppUrl
         get => _remoteAppUrl;
         set
         {
-            if (value is null)
-            {
-                throw new ArgumentNullException(nameof(RemoteAppUrl));
-            }
+            ArgumentNullException.ThrowIfNull(value);
 
             // Path must end in '/' so that it will combine correctly with subpaths
-            if (!value.AbsolutePath.EndsWith("/"))
+            if (!value.AbsolutePath.EndsWith("/", StringComparison.Ordinal))
             {
                 var builder = new UriBuilder(value);
                 builder.Path += "/";
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientPostConfigureOptions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientPostConfigureOptions.cs
index bb1438c3b5..a91b713343 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientPostConfigureOptions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RemoteAppClientPostConfigureOptions.cs
@@ -13,10 +13,12 @@ public void PostConfigure(string name, RemoteAppClientOptions options)
     {
         if (options.BackchannelClient is null)
         {
+#pragma warning disable CA2000 // Dispose objects before losing scope
             options.BackchannelClient = new HttpClient(
                 options.BackchannelHandler
                 // Disable cookies in the HTTP client because the service will manage the cookie header directly
                 ?? new HttpClientHandler { UseCookies = false, AllowAutoRedirect = false });
+#pragma warning restore CA2000 // Dispose objects before losing scope
 
             // Set base address and API key header based on options
             if (options.RemoteAppUrl is not null)
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/RemoteSession/RemoteAppSessionStateExtensions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/RemoteSession/RemoteAppSessionStateExtensions.cs
index c31c9b7a75..6aad452f88 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/RemoteSession/RemoteAppSessionStateExtensions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/RemoteSession/RemoteAppSessionStateExtensions.cs
@@ -11,10 +11,7 @@ public static class RemoteAppSessionStateExtensions
 {
     public static ISystemWebAdapterRemoteClientAppBuilder AddSessionClient(this ISystemWebAdapterRemoteClientAppBuilder builder, Action<RemoteAppSessionStateClientOptions>? configure = null)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
 
         builder.Services.AddTransient<ISessionManager, RemoteAppSessionStateManager>();
 
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/Wrapped/ISystemWebAdapterBuilderSessionExtensions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/Wrapped/ISystemWebAdapterBuilderSessionExtensions.cs
index 7102d557d5..c29e0fe7ed 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/Wrapped/ISystemWebAdapterBuilderSessionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionState/Wrapped/ISystemWebAdapterBuilderSessionExtensions.cs
@@ -12,10 +12,7 @@ public static class ISystemWebAdapterBuilderSessionExtensions
 {
     public static ISystemWebAdapterBuilder WrapAspNetCoreSession(this ISystemWebAdapterBuilder builder, Action<SessionOptions>? options = null)
     {
-        if (builder is null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
+        ArgumentNullException.ThrowIfNull(builder);
 
         if (options is null)
         {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SystemWebAdaptersExtensions.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SystemWebAdaptersExtensions.cs
index b00422bb7a..7b564e8976 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SystemWebAdaptersExtensions.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SystemWebAdaptersExtensions.cs
@@ -27,6 +27,8 @@ public static ISystemWebAdapterBuilder AddSystemWebAdapters(this IServiceCollect
 
     public static void UseSystemWebAdapters(this IApplicationBuilder app)
     {
+        ArgumentNullException.ThrowIfNull(app);
+
         HttpRuntime.Current = app.ApplicationServices.GetRequiredService<IHttpRuntime>();
 
         app.UseMiddleware<SetDefaultResponseHeadersMiddleware>();
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContext.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContext.cs
index 4160273a14..750e92af56 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContext.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContext.cs
@@ -60,10 +60,7 @@ public IPrincipal User
 
     public void RewritePath(string path)
     {
-        if (path is null)
-        {
-            throw new ArgumentNullException(nameof(path));
-        }
+        ArgumentNullException.ThrowIfNull(path);
 
         // Extract query string
         string? qs = null;
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContextWrapper.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContextWrapper.cs
index 1571ceaaff..11b438681a 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContextWrapper.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpContextWrapper.cs
@@ -17,10 +17,7 @@ public class HttpContextWrapper : HttpContextBase
 
         public HttpContextWrapper(HttpContext httpContext)
         {
-            if (httpContext == null)
-            {
-                throw new ArgumentNullException(nameof(httpContext));
-            }
+            ArgumentNullException.ThrowIfNull(httpContext);
 
             _context = httpContext;
         }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpCookieCollection.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpCookieCollection.cs
index bdac02c02f..1347cb47e0 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpCookieCollection.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpCookieCollection.cs
@@ -74,20 +74,14 @@ internal HttpCookieCollection(HttpResponse response)
 
     public void Add(HttpCookie cookie)
     {
-        if (cookie is null)
-        {
-            throw new ArgumentNullException(nameof(cookie));
-        }
+        ArgumentNullException.ThrowIfNull(cookie);
 
         BaseAdd(cookie.Name, cookie);
     }
 
     public void Set(HttpCookie cookie)
     {
-        if (cookie is null)
-        {
-            throw new ArgumentNullException(nameof(cookie));
-        }
+        ArgumentNullException.ThrowIfNull(cookie);
 
         BaseSet(cookie.Name, cookie);
     }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpException.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpException.cs
index 7c49376511..132865f991 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpException.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpException.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Net;
 
 namespace System.Web;
@@ -9,7 +8,7 @@ namespace System.Web;
 public class HttpException : SystemException
 {
     private readonly int _httpStatusCode = 500;
-    
+
     public HttpException()
     {
     }
@@ -57,16 +56,11 @@ public HttpException(HttpStatusCode httpStatusCode, string message, Exception in
         _httpStatusCode = (int)httpStatusCode;
     }
 
+    [Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1024:Use properties where appropriate", Justification = Constants.ApiFromAspNet)]
     public int GetHttpCode()
     {
-        return _httpStatusCode;
+        return StatusCode;
     }
 
-    public int StatusCode
-    {
-        get
-        {
-            return _httpStatusCode;
-        }
-    }
+    public int StatusCode => _httpStatusCode;
 }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpResponse.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpResponse.cs
index 17fdb6acb6..bf570f2609 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpResponse.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpResponse.cs
@@ -262,10 +262,7 @@ private string ResolvePath(string url)
 
         public void BinaryWrite(byte[] buffer)
         {
-            if (buffer is null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
+            ArgumentNullException.ThrowIfNull(buffer);
 
             OutputStream.Write(buffer, 0, buffer.Length);
         }
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpServerUtility.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpServerUtility.cs
index 6dd601f108..94b0edadb0 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/HttpServerUtility.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/HttpServerUtility.cs
@@ -49,10 +49,7 @@ public void ClearError()
     /// <exception cref="ArgumentNullException"></exception>
     public static byte[]? UrlTokenDecode(string input)
     {
-        if (input is null)
-        {
-            throw new ArgumentNullException(nameof(input));
-        }
+        ArgumentNullException.ThrowIfNull(input);
 
         if (input.Length == 0)
         {
@@ -81,10 +78,7 @@ public void ClearError()
     [Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1055:URI-like return values should not be strings", Justification = Constants.ApiFromAspNet)]
     public static string UrlTokenEncode(byte[] input)
     {
-        if (input is null)
-        {
-            throw new ArgumentNullException(nameof(input));
-        }
+        ArgumentNullException.ThrowIfNull(input);
 
         if (input.Length == 0)
         {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericCollectionWrapper.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericCollectionWrapper.cs
index edfa22205b..a3d817ffa7 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericCollectionWrapper.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericCollectionWrapper.cs
@@ -25,10 +25,7 @@ public NonGenericCollectionWrapper(ICollection<T> collection)
 
         public void CopyTo(Array array, int index)
         {
-            if (array is null)
-            {
-                throw new ArgumentNullException(nameof(array));
-            }
+            ArgumentNullException.ThrowIfNull(array);
 
             foreach (var item in _collection)
             {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericDictionaryWrapper.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericDictionaryWrapper.cs
index 2ddeca5f56..d933d5fa4d 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericDictionaryWrapper.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Internal/NonGenericDictionaryWrapper.cs
@@ -70,10 +70,7 @@ public ICollection Values
 
         public void CopyTo(Array array, int index)
         {
-            if (array is null)
-            {
-                throw new ArgumentNullException(nameof(array));
-            }
+            ArgumentNullException.ThrowIfNull(array);
 
             foreach (var item in _original)
             {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/SessionState/HttpSessionState.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/SessionState/HttpSessionState.cs
index 0f11785fe6..afcb50ba48 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/SessionState/HttpSessionState.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/SessionState/HttpSessionState.cs
@@ -53,10 +53,7 @@ public object? this[string name]
 
     public void CopyTo(Array array, int index)
     {
-        if (array is null)
-        {
-            throw new ArgumentNullException(nameof(array));
-        }
+        ArgumentNullException.ThrowIfNull(array);
 
         foreach (var key in _container.Keys)
         {
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Utilities/UrlPath.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/Utilities/UrlPath.cs
index 73a34401ab..4e6cf3b2c4 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/Utilities/UrlPath.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Utilities/UrlPath.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Text;
 
 namespace System.Web.Util;
@@ -44,10 +45,10 @@ private static bool HasScheme(string virtualPath)
         // If ':' is found, then as long as we find a '/' before the ':', it cannot be
         // a scheme because schemes don't contain '/'.  Otherwise, we will assume it has a 
         // scheme.
-        var indexOfColon = virtualPath.IndexOf(':');
+        var indexOfColon = virtualPath.IndexOf(':', StringComparison.Ordinal);
         if (indexOfColon == -1)
             return false;
-        var indexOfSlash = virtualPath.IndexOf('/');
+        var indexOfSlash = virtualPath.IndexOf('/', StringComparison.Ordinal);
         return indexOfSlash == -1 || indexOfColon < indexOfSlash;
     }
 
@@ -78,18 +79,18 @@ internal static void CheckValidVirtualPath(string path)
         // Check if it looks like a physical path (UNC shares and C:)
         if (IsAbsolutePhysicalPath(path))
         {
-            throw new HttpException(string.Format(Physical_path_not_allowed, path));
+            throw new HttpException(string.Format(CultureInfo.InvariantCulture, Physical_path_not_allowed, path));
         }
 
         // Virtual path can't have colons.
-        var iqs = path.IndexOf('?');
+        var iqs = path.IndexOf('?', StringComparison.Ordinal);
         if (iqs >= 0)
         {
             path = path[..iqs];
         }
         if (HasScheme(path))
         {
-            throw new HttpException(string.Format(Invalid_vpath, path));
+            throw new HttpException(string.Format(CultureInfo.InvariantCulture, Invalid_vpath, path));
         }
     }
 
@@ -99,7 +100,7 @@ internal static string Combine(string appPath, string basepath, string relative)
 
         if (string.IsNullOrEmpty(relative))
         {
-             throw new ArgumentNullException(nameof(relative));
+            throw new ArgumentNullException(nameof(relative));
         }
         if (string.IsNullOrEmpty(basepath))
         {
@@ -174,7 +175,7 @@ internal static string Reduce(string path)
         string? queryString = null;
         if (!string.IsNullOrEmpty(path))
         {
-            var iqs = path.IndexOf('?');
+            var iqs = path.IndexOf('?', StringComparison.Ordinal);
             if (iqs >= 0)
             {
                 queryString = path[iqs..];
@@ -199,7 +200,7 @@ internal static string FixVirtualPathSlashes(string virtualPath)
         // Replace any double forward slashes
         for (; ; )
         {
-            var newPath = virtualPath.Replace("//", "/");
+            var newPath = virtualPath.Replace("//", "/", StringComparison.Ordinal);
 
             // If it didn't do anything, we're done
             if (newPath == (object)virtualPath)
@@ -251,15 +252,9 @@ internal static string MakeVirtualPathAppAbsolute(string virtualPath, string app
 
     internal static bool VirtualPathStartsWithVirtualPath(string virtualPath1, string virtualPath2)
     {
-        if (virtualPath1 == null)
-        {
-            throw new ArgumentNullException(nameof(virtualPath1));
-        }
+        ArgumentNullException.ThrowIfNull(virtualPath1);
 
-        if (virtualPath2 == null)
-        {
-            throw new ArgumentNullException(nameof(virtualPath2));
-        }
+        ArgumentNullException.ThrowIfNull(virtualPath2);
 
         // if virtualPath1 as a string doesn't start with virtualPath2 as s string, then no for sure
         if (!StringUtil.StringStartsWithIgnoreCase(virtualPath1, virtualPath2))
@@ -412,15 +407,15 @@ internal static string MakeRelative(string fromPath, string toPath)
 
         // Make sure both virtual paths are rooted
         if (!Util.UrlPath.IsRooted(fromPath))
-            throw new ArgumentException(string.Format(Path_must_be_rooted, fromPath));
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Path_must_be_rooted, fromPath));
         if (!Util.UrlPath.IsRooted(toPath))
-            throw new ArgumentException(string.Format(Path_must_be_rooted, toPath));
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Path_must_be_rooted, toPath));
 
         // Remove the query string, so that System.Uri doesn't corrupt it
         string? queryString = null;
         if (!string.IsNullOrEmpty(toPath))
         {
-            var iqs = toPath.IndexOf('?');
+            var iqs = toPath.IndexOf('?', StringComparison.Ordinal);
             if (iqs >= 0)
             {
                 queryString = toPath[iqs..];
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/VirtualPathUtility.cs b/src/Microsoft.AspNetCore.SystemWebAdapters/VirtualPathUtility.cs
index fe9169fb0c..16357762e0 100644
--- a/src/Microsoft.AspNetCore.SystemWebAdapters/VirtualPathUtility.cs
+++ b/src/Microsoft.AspNetCore.SystemWebAdapters/VirtualPathUtility.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Text;
 
 namespace System.Web;
@@ -45,9 +46,9 @@ public static class VirtualPathUtility
     /// <returns>The combined <paramref name="basePath" /> and <paramref name="relativePath" />.</returns>
     /// <param name="basePath">The base path.</param>
     /// <param name="relativePath">The relative path.</param>
-    /// <exception cref="T:System.Web.HttpException">
+    /// <exception cref="HttpException">
     ///   <paramref name="relativePath" /> is a physical path.-or-<paramref name="relativePath" /> includes one or more colons.</exception>
-    /// <exception cref="T:System.ArgumentNullException">
+    /// <exception cref="ArgumentNullException">
     ///   <paramref name="relativePath" /> is null or an empty string.-or-<paramref name="basePath" /> is null or an empty string.</exception>
     public static string Combine(string basePath, string relativePath)
     {
@@ -57,7 +58,7 @@ public static string Combine(string basePath, string relativePath)
     /// <summary>Returns the directory portion of a virtual path.</summary>
     /// <returns>The directory referenced in the virtual path. </returns>
     /// <param name="virtualPath">The virtual path.</param>
-    /// <exception cref="T:System.ArgumentException">
+    /// <exception cref="ArgumentException">
     ///   <paramref name="virtualPath" /> is not rooted. - or -<paramref name="virtualPath" /> is null or an empty string.</exception>
     public static string? GetDirectory(string virtualPath)
     {
@@ -65,7 +66,7 @@ public static string Combine(string basePath, string relativePath)
             throw new ArgumentNullException(nameof(virtualPath), Empty_path_has_no_directory);
 
         if (virtualPath[0] != '/' && virtualPath[0] != Util.UrlPath.AppRelativeCharacter)
-            throw new ArgumentException(string.Format(Util.UrlPath.Path_must_be_rooted, virtualPath), nameof(virtualPath));
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Util.UrlPath.Path_must_be_rooted, virtualPath), nameof(virtualPath));
 
         if ((virtualPath[0] == Util.UrlPath.AppRelativeCharacter && virtualPath.Length == 1) || virtualPath == Util.UrlPath.AppRelativeCharacterString) return "/";
         if (virtualPath.Length == 1) return null;
@@ -74,7 +75,7 @@ public static string Combine(string basePath, string relativePath)
 
         // This could happen if the input looks like "~abc"
         if (slashIndex < 0)
-            throw new ArgumentException(string.Format(Util.UrlPath.Path_must_be_rooted, virtualPath), nameof(virtualPath));
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Util.UrlPath.Path_must_be_rooted, virtualPath), nameof(virtualPath));
 
         return virtualPath[..(slashIndex + 1)];
     }
@@ -82,7 +83,7 @@ public static string Combine(string basePath, string relativePath)
     /// <summary>Retrieves the extension of the file that is referenced in the virtual path.</summary>
     /// <returns>The file name extension string literal, including the period (.), null, or an empty string ("").</returns>
     /// <param name="virtualPath">The virtual path.</param>
-    /// <exception cref="T:System.ArgumentException">
+    /// <exception cref="ArgumentException">
     ///   <paramref name="virtualPath" /> contains one or more characters that are not valid, as defined in <see cref="F:System.IO.Path.InvalidPathChars" />. </exception>
     public static string? GetExtension(string virtualPath)
     {
@@ -94,7 +95,7 @@ public static string Combine(string basePath, string relativePath)
     /// <summary>Retrieves the file name of the file that is referenced in the virtual path.</summary>
     /// <returns>The file name literal after the last directory character in <paramref name="virtualPath" />; otherwise, the last directory name, if the last character of <paramref name="virtualPath" /> is a directory or volume separator character.</returns>
     /// <param name="virtualPath">The virtual path. </param>
-    /// <exception cref="T:System.ArgumentException">
+    /// <exception cref="ArgumentException">
     ///   <paramref name="virtualPath" /> contains one or more characters that are not valid, as defined in <see cref="F:System.IO.Path.InvalidPathChars" />. </exception>
     public static string? GetFileName(string virtualPath)
     {
@@ -106,7 +107,7 @@ public static string Combine(string basePath, string relativePath)
     /// <summary>Returns a Boolean value indicating whether the specified virtual path is absolute; that is, it starts with a literal slash mark (/).</summary>
     /// <returns>true if <paramref name="virtualPath" /> is an absolute path and is not null or an empty string (""); otherwise, false.</returns>
     /// <param name="virtualPath">The virtual path to check. </param>
-    /// <exception cref="T:System.ArgumentNullException">
+    /// <exception cref="ArgumentNullException">
     ///   <paramref name="virtualPath" /> is null.</exception>
     public static bool IsAbsolute(string virtualPath)
     {
@@ -117,7 +118,7 @@ public static bool IsAbsolute(string virtualPath)
     /// <summary>Returns a Boolean value indicating whether the specified virtual path is relative to the application.</summary>
     /// <returns>true if <paramref name="virtualPath" /> is relative to the application; otherwise, false.</returns>
     /// <param name="virtualPath">The virtual path to check. </param>
-    /// <exception cref="T:System.ArgumentNullException">
+    /// <exception cref="ArgumentNullException">
     ///   <paramref name="virtualPath" /> is null.</exception>
     public static bool IsAppRelative(string virtualPath)
     {
@@ -129,7 +130,7 @@ public static bool IsAppRelative(string virtualPath)
     /// <returns>The relative virtual path from <paramref name="fromPath" /> to <paramref name="toPath" />.</returns>
     /// <param name="fromPath">The starting virtual path to return the relative virtual path from.</param>
     /// <param name="toPath">The ending virtual path to return the relative virtual path to.</param>
-    /// <exception cref="T:System.ArgumentException">
+    /// <exception cref="ArgumentException">
     ///   <paramref name="fromPath" /> is not rooted.- or -<paramref name="toPath" /> is not rooted.</exception>
     public static string MakeRelative(string fromPath, string toPath) => Util.UrlPath.MakeRelative(fromPath, toPath);
 
@@ -147,9 +148,9 @@ public static bool IsAppRelative(string virtualPath)
     /// <summary>Converts a virtual path to an application absolute path.</summary>
     /// <returns>The absolute path representation of the specified virtual path. </returns>
     /// <param name="virtualPath">The virtual path to convert to an application-relative path. </param>
-    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    /// <exception cref="ArgumentOutOfRangeException">
     ///   <paramref name="virtualPath" /> is not rooted. </exception>
-    /// <exception cref="T:System.Web.HttpException">A leading double period (..) is used to exit above the top directory.</exception>
+    /// <exception cref="HttpException">A leading double period (..) is used to exit above the top directory.</exception>
     public static string ToAbsolute(string virtualPath)
     {
         if (Util.UrlPath.IsRooted(virtualPath)) return virtualPath;
@@ -161,9 +162,9 @@ public static string ToAbsolute(string virtualPath)
     /// <returns>The absolute virtual path representation of <paramref name="virtualPath" />.</returns>
     /// <param name="virtualPath">The virtual path to convert to an application-relative path.</param>
     /// <param name="applicationPath">The application path to use to convert <paramref name="virtualPath" /> to a relative path.</param>
-    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    /// <exception cref="ArgumentOutOfRangeException">
     ///   <paramref name="applicationPath" /> is not rooted.</exception>
-    /// <exception cref="T:System.Web.HttpException">A leading double period (..) is used in the application path to exit above the top directory.</exception>
+    /// <exception cref="HttpException">A leading double period (..) is used in the application path to exit above the top directory.</exception>
     public static string ToAbsolute(string virtualPath, string applicationPath)
     {
         if (string.IsNullOrEmpty(applicationPath)) throw new ArgumentNullException(nameof(applicationPath));
@@ -177,7 +178,7 @@ public static string ToAbsolute(string virtualPath, string applicationPath)
     /// <summary>Converts a virtual path to an application-relative path using the application virtual path that is in the <see cref="P:System.Web.HttpRuntime.AppDomainAppVirtualPath" /> property. </summary>
     /// <returns>The application-relative path representation of <paramref name="virtualPath" />.</returns>
     /// <param name="virtualPath">The virtual path to convert to an application-relative path. </param>
-    /// <exception cref="T:System.ArgumentException">
+    /// <exception cref="ArgumentException">
     ///   <paramref name="virtualPath" /> is null. </exception>
     public static string ToAppRelative(string virtualPath) => ToAppRelative(virtualPath, HttpRuntime.AppDomainAppVirtualPath);
 
@@ -187,9 +188,9 @@ public static string ToAbsolute(string virtualPath, string applicationPath)
     /// <param name="applicationPath">The application path to use to convert <paramref name="virtualPath" /> to a relative path. </param>
     public static string ToAppRelative(string virtualPath, string applicationPath)
     {
+        ArgumentNullException.ThrowIfNull(virtualPath);
+
         var appPath = AppendTrailingSlash(applicationPath);
-        if (virtualPath == null)
-            throw new ArgumentNullException(nameof(virtualPath));
 
         var appPathLength = appPath.Length;
         var virtualPathLength = virtualPath.Length;
diff --git a/src/Services/ApiKeyAttribute.cs b/src/Services/ApiKeyAttribute.cs
index 305f09b8df..05e373cd10 100644
--- a/src/Services/ApiKeyAttribute.cs
+++ b/src/Services/ApiKeyAttribute.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-internal class ApiKeyAttribute: RegularExpressionAttribute
+internal sealed class ApiKeyAttribute: RegularExpressionAttribute
 {
     private const string DefaultErrorMessage = "API Key must be 32 hex characters (for example a GUID)";
 
diff --git a/src/Services/SessionState/BinarySessionSerializer.cs b/src/Services/SessionState/BinarySessionSerializer.cs
index db37d094de..f07bb2d5c6 100644
--- a/src/Services/SessionState/BinarySessionSerializer.cs
+++ b/src/Services/SessionState/BinarySessionSerializer.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.AspNetCore.SystemWebAdapters.SessionState.Serialization;
 
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Maintainability", "CA1510:Use ArgumentNullException throw helper", Justification = "Source shared with .NET Framework that does not have the method")]
 internal partial class BinarySessionSerializer : ISessionSerializer
 {
     private const byte Version = 1;
diff --git a/src/Services/SessionState/JsonSessionSerializerExtensions.cs b/src/Services/SessionState/JsonSessionSerializerExtensions.cs
index 67533dfec7..db8212ae52 100644
--- a/src/Services/SessionState/JsonSessionSerializerExtensions.cs
+++ b/src/Services/SessionState/JsonSessionSerializerExtensions.cs
@@ -16,6 +16,7 @@ namespace System.Web;
 namespace Microsoft.Extensions.DependencyInjection;
 #endif
 
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Maintainability", "CA1510:Use ArgumentNullException throw helper", Justification = "Source shared with .NET Framework that does not have the method")]
 public static class JsonSessionSerializerExtensions
 {
     public static ISystemWebAdapterBuilder AddJsonSessionSerializer(this ISystemWebAdapterBuilder builder, Action<JsonSessionSerializerOptions>? configure = null)
diff --git a/src/Services/SessionState/SessionSerializerExtensions.cs b/src/Services/SessionState/SessionSerializerExtensions.cs
index d79dc2c6ce..99a70af6da 100644
--- a/src/Services/SessionState/SessionSerializerExtensions.cs
+++ b/src/Services/SessionState/SessionSerializerExtensions.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 
 public static class SessionSerializerExtensions
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Maintainability", "CA1510:Use ArgumentNullException throw helper", Justification = "Source shared with .NET Framework that does not have the method")]
     public static ISystemWebAdapterBuilder AddSessionSerializer(this ISystemWebAdapterBuilder builder, Action<SessionSerializerOptions>? configure = null)
     {
         if (builder is null)
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Authentication/RemoteAppAuthenticationServiceTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Authentication/RemoteAppAuthenticationServiceTests.cs
index 2306f9faba..893e63d592 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Authentication/RemoteAppAuthenticationServiceTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Authentication/RemoteAppAuthenticationServiceTests.cs
@@ -15,6 +15,9 @@ public class RemoteAppAuthenticationServiceTests
     [MemberData(nameof(GetHeadersForConcatenation))]
     public void AddHeadersConcatenation(Dictionary<string, StringValues> originalHeaders, Dictionary<string, StringValues> resultHeaders)
     {
+        ArgumentNullException.ThrowIfNull(originalHeaders);
+        ArgumentNullException.ThrowIfNull(resultHeaders);
+
         var originalRequest = new Mock<HttpRequestCore>();
         originalRequest.Setup(r => r.Headers).Returns(new HeaderDictionary(originalHeaders));
         originalRequest.Setup(r => r.Scheme).Returns("scheme");
@@ -25,7 +28,7 @@ public void AddHeadersConcatenation(Dictionary<string, StringValues> originalHea
         resultHeaders.Add(AuthenticationConstants.ForwardedProtoHeaderName, "scheme");
         resultHeaders.Add(AuthenticationConstants.MigrationAuthenticateRequestHeaderName, "true");
 
-        var authRequest = new HttpRequestMessage();
+        using var authRequest = new HttpRequestMessage();
 
         RemoteAppAuthenticationService.AddHeaders(originalHeaders.Keys, originalRequest.Object, authRequest);
 
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/HttpRequestAdapterFeatureTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/HttpRequestAdapterFeatureTests.cs
index 282a014dcb..a7bcb2375f 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/HttpRequestAdapterFeatureTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/HttpRequestAdapterFeatureTests.cs
@@ -9,6 +9,8 @@
 using Moq;
 using Xunit;
 
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance
+
 namespace Microsoft.AspNetCore.SystemWebAdapters;
 
 public class HttpRequestAdapterFeatureTests
@@ -24,7 +26,7 @@ public void InputStream()
         var other = new Mock<IHttpRequestFeature>();
         other.Setup(o => o.Body).Returns(stream.Object);
 
-        var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
+        using var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
         var adapterFeature = (IHttpRequestAdapterFeature)feature;
 
         // Assert/Act
@@ -38,12 +40,12 @@ public void InputStream()
     public async Task Prebuffer(bool canSeek)
     {
         // Arrange
-        var stream = new TestStream(canSeek);
+        using var stream = new TestStream(canSeek);
 
         var other = new Mock<IHttpRequestFeature>();
         other.Setup(o => o.Body).Returns(stream);
 
-        var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
+        using var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
         await feature.BufferInputStreamAsync(default);
 
         var adapterFeature = (IHttpRequestAdapterFeature)feature;
@@ -66,12 +68,12 @@ public async Task Prebuffer(bool canSeek)
     public void GetBufferless(bool canSeek)
     {
         // Arrange
-        var stream = new TestStream(canSeek);
+        using var stream = new TestStream(canSeek);
 
         var other = new Mock<IHttpRequestFeature>();
         other.Setup(o => o.Body).Returns(stream);
 
-        var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
+        using var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
         var adapterFeature = (IHttpRequestAdapterFeature)feature;
 
         // Act
@@ -90,12 +92,12 @@ public void GetBufferless(bool canSeek)
     public void GetBuffered(bool canSeek)
     {
         // Arrange
-        var stream = new TestStream(canSeek);
+        using var stream = new TestStream(canSeek);
 
         var other = new Mock<IHttpRequestFeature>();
         other.Setup(o => o.Body).Returns(stream);
 
-        var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
+        using var feature = new HttpRequestAdapterFeature(other.Object, DefaultThreshold, default);
         var adapterFeature = (IHttpRequestAdapterFeature)feature;
 
         // Act
@@ -107,7 +109,7 @@ public void GetBuffered(bool canSeek)
         Assert.Equal(ReadEntityBodyMode.Buffered, mode);
     }
 
-    private class TestStream : MemoryStream
+    private sealed class TestStream : MemoryStream
     {
         public TestStream(bool canSeek) => CanSeek = canSeek;
 
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs
index 4466bdcfb3..ad0352987d 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/RemoteAppClientOptionsTests.cs
@@ -24,7 +24,7 @@ public class RemoteAppClientOptionsTests
     [InlineData("HeaderName", "", "http://test", false)]
     [InlineData("HeaderName", "36705d36-eba0-44f9-a2e0-c57e6f521274", null, false)]
     [Theory]
-    public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteAppUrl, bool shouldSucceed)
+    public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteApp, bool shouldSucceed)
     {
         // Arrange
         var services = new ServiceCollection();
@@ -35,9 +35,9 @@ public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteAppU
             options.ApiKey = apiKey;
             options.ApiKeyHeader = apiKeyHeader;
 
-            if (remoteAppUrl is not null)
+            if (remoteApp is not null)
             {
-                options.RemoteAppUrl = new Uri(remoteAppUrl, UriKind.Absolute);
+                options.RemoteAppUrl = new Uri(remoteApp, UriKind.Absolute);
             }
         });
 
@@ -56,7 +56,7 @@ public void VerifyIsCalled(string apiKeyHeader, string apiKey, string remoteAppU
         }
     }
 
-    private class TestBuilder : ISystemWebAdapterBuilder
+    private sealed class TestBuilder : ISystemWebAdapterBuilder
     {
         public IServiceCollection Services { get; set; } = null!;
     }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SessionState/Serialization/JsonSessionKeySerializerTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SessionState/Serialization/JsonSessionKeySerializerTests.cs
index 3ff3aad482..5bb29d7d18 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SessionState/Serialization/JsonSessionKeySerializerTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SessionState/Serialization/JsonSessionKeySerializerTests.cs
@@ -166,7 +166,7 @@ public void SerializeIncorrectTypeRegistered()
         Assert.Empty(bytes);
     }
 
-    private class Type1
+    private sealed class Type1
     {
     }
 
@@ -174,7 +174,7 @@ private class Type2
     {
     }
 
-    private class Type2Derived : Type2
+    private sealed class Type2Derived : Type2
     {
     }
 }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SetDefaultResponseHeadersMiddlewareTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SetDefaultResponseHeadersMiddlewareTests.cs
index c9e6563043..2726675936 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SetDefaultResponseHeadersMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/SetDefaultResponseHeadersMiddlewareTests.cs
@@ -82,7 +82,7 @@ public async Task AddedInLaterMiddleware(string name, string value)
     }
 
     // The default feature does not include a functional `OnStarting` method
-    private class StartupCallbackFeature : HttpResponseFeature
+    private sealed class StartupCallbackFeature : HttpResponseFeature
     {
         private Func<Task>? _callback;
 
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs
index 7e5668114e..a006b26108 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Authentication/RemoteAppAuthenticationServerOptionsTests.cs
@@ -41,7 +41,7 @@ public void VerifyIsCalled(string endpoint, bool shouldSucceed)
         }
     }
 
-    private class TestBuilder : ISystemWebAdapterRemoteServerAppBuilder
+    private sealed class TestBuilder : ISystemWebAdapterRemoteServerAppBuilder
     {
         public IServiceCollection Services { get; set; } = null!;
     }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs
index 9ab91f56b3..9b7b3d6b42 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/RemoteAppServerOptionsTests.cs
@@ -48,7 +48,7 @@ public void VerifyIsCalled(string apiKeyHeader, string apiKey, bool shouldSuccee
         }
     }
 
-    private class TestBuilder : ISystemWebAdapterBuilder
+    private sealed class TestBuilder : ISystemWebAdapterBuilder
     {
         public IServiceCollection Services { get; set; } = null!;
     }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Caching/CacheTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Caching/CacheTests.cs
index d8daf8ab9d..c9c47a550f 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Caching/CacheTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Caching/CacheTests.cs
@@ -291,5 +291,5 @@ public void InsertItem()
         Assert.Same(item, cache[key]);
     }
 
-    private record Removal(string Key, object Item, CacheItemRemovedReason Reason);
+    private sealed record Removal(string Key, object Item, CacheItemRemovedReason Reason);
 }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Configuration/BrowserCapabilitiesFactoryTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Configuration/BrowserCapabilitiesFactoryTests.cs
index 81415e9493..2327d7ff29 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Configuration/BrowserCapabilitiesFactoryTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Configuration/BrowserCapabilitiesFactoryTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Web.Configuration;
 using Xunit;
 
@@ -27,7 +28,7 @@ public void VerifyCapabilities(TestData data)
         Assert.Equal(data.MajorVersion, result["majorversion"]);
         Assert.Equal(data.MinorVersion, result["minorversion"]);
         Assert.Equal(data.Platform, result["platform"]);
-        Assert.Equal(data.IsMobileDevice, Convert.ToBoolean(result["isMobileDevice"]));
+        Assert.Equal(data.IsMobileDevice, Convert.ToBoolean(result["isMobileDevice"], CultureInfo.InvariantCulture));
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Used for tests")]
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs
index a26433ab14..e20bca7742 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpContextTests.cs
@@ -77,6 +77,7 @@ public void NonClaimsPrincipalIsCopied()
         }
 
         [Fact]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1859:Use concrete types when possible for improved performance", Justification = "Use for tests")]
         public void GetServiceReturnsExpected()
         {
             var coreContext = new DefaultHttpContext();
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpExceptionTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpExceptionTests.cs
index 835a9a2897..423ce1ac10 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpExceptionTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpExceptionTests.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Net;
 using System.Web;
-using AutoFixture;
 using Xunit;
 
 namespace Microsoft.AspNetCore.SystemWebAdapters;
 
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2201:Do not raise reserved exception types", Justification = "Used for tests")]
 public class HttpExceptionTests
 {
     [Fact]
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs
index f54aca6874..02479d6cd7 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs
@@ -1012,7 +1012,7 @@ public void AcceptTypesEmpty()
             Assert.Same(Array.Empty<string>(), acceptTypes);
         }
 
-        private class RequestCookies : Dictionary<string, string>, IRequestCookieCollection
+        private sealed class RequestCookies : Dictionary<string, string>, IRequestCookieCollection
         {
             ICollection<string> IRequestCookieCollection.Keys => Keys;
         }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpResponseTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpResponseTests.cs
index 38c71de22d..a7e0d4ef6c 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpResponseTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpResponseTests.cs
@@ -522,6 +522,7 @@ public void IsRequestBeingRedirected(int statusCode, bool isRequestBeingRedirect
     [InlineData("/dir1/", "", "/", false, true)]
 
     [Theory]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "Testing")]
     public void Redirect(string vdir, string url, string resolved, bool permanent, bool? endResponse)
     {
         // Arrange
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpServerUtilityTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpServerUtilityTests.cs
index d35de6e4e7..76901610f1 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpServerUtilityTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpServerUtilityTests.cs
@@ -19,12 +19,13 @@ public class HttpServerUtilityTests
     public HttpServerUtilityTests()
     {
         _fixture = new Fixture();
-        HttpRuntime.Current = new DefaultHttpRuntime();
+        HttpRuntime.Current = new TestHttpRuntime();
     }
 
-    internal class DefaultHttpRuntime : IHttpRuntime
+    internal sealed class TestHttpRuntime : IHttpRuntime
     {
         public string AppDomainAppVirtualPath => "/";
+
         public string AppDomainAppPath => System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
             "C:\\ExampleSites\\TestMapPath" : "/apps/test-map-path";
     }
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Internal/StringValuesNameValueCollectionTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Internal/StringValuesNameValueCollectionTests.cs
index 28532484e8..4138bf56a5 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Internal/StringValuesNameValueCollectionTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Internal/StringValuesNameValueCollectionTests.cs
@@ -72,7 +72,7 @@ public void IsReadOnly()
             Assert.Throws<NotSupportedException>(() => collection.Add(_fixture.Create<string>(), _fixture.Create<string>()));
         }
 
-        private class Builder : IReadOnlyDictionary<string, StringValues>
+        private sealed class Builder : IReadOnlyDictionary<string, StringValues>
         {
             private List<KeyValuePair<string, StringValues>> _items = new();
 
diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs
index a319d73cf7..37635502e9 100644
--- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs
+++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/VirtualPathUtilityTests.cs
@@ -6,11 +6,12 @@ namespace Microsoft.AspNetCore.SystemWebAdapters.Tests
 {
     public class VirtualPathUtilityTests
     {
-        public VirtualPathUtilityTests() => HttpRuntime.Current = new DefaultHttpRuntime();
+        public VirtualPathUtilityTests() => HttpRuntime.Current = new TestRuntime();
 
-        internal class DefaultHttpRuntime : IHttpRuntime
+        internal sealed class TestRuntime : IHttpRuntime
         {
             public string AppDomainAppVirtualPath => "/";
+
             public string AppDomainAppPath => "C:\\";
         }